diff options
| author | Logan Chien <loganchien@google.com> | 2018-07-26 00:19:50 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2018-08-09 10:45:18 +0800 |
| commit | 031d2b32e35314270a6d0cec6233e0649523133c (patch) | |
| tree | 462b31b959d37320bc8195017f41144b351709d2 /java/androidmk.go | |
| parent | 7a127f97b612ea9abbb9378880931fe5339f9e60 (diff) | |
| download | android_build_soong-031d2b32e35314270a6d0cec6233e0649523133c.tar.gz android_build_soong-031d2b32e35314270a6d0cec6233e0649523133c.tar.bz2 android_build_soong-031d2b32e35314270a6d0cec6233e0649523133c.zip | |
Support prebuilt shared libs end with versions
This commit changes how `cc/androidmk.go` generates LOCAL_MODULE_STEM,
LOCAL_MODULE_SUFFIX, and LOCAL_BUILT_MODULE_STEM. Now, `splitFileExt()`
takes a file name and a list of expected file extensions.
`splitFileExt()` searches the first occurrence of expected file
extensions in the file name. If it can not find any, it will simply
return the last file extension.
Before this commit, `cc/androidmk.go` simply extracts the last file
extension (e.g. `.so`). However, if the prebuilt shared libs end with
version numbers (e.g. `libc++.so.1`), it will use `$(LOCAL_MODULE).1` as
LOCAL_BUILT_MODULE_STEM and this will lead to missing target ninja
error.
Bug: 111579848
Test: Build a program that links libc++_host (from prebuilts/clang)
Change-Id: Id96726c69705d518ea725bb6abd8ff4527ca0cbc
Diffstat (limited to 'java/androidmk.go')
0 files changed, 0 insertions, 0 deletions