StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use LateStaticLibs for ndk_libandroid_support

Browse Source 
This will obsolete the workaround in prebuilts/ndk/Android.bp to
export the ndk_libandroid_support headers from ndk_libc++_shared,
which would no longer have worked after the next patch.

Test: m checkbuild
Test: TestIncludeDirectoryOrdering
Change-Id: I9b4e5799d939433da547661b862e9db5a4aacb09
This commit is contained in:
Colin Cross
2021-06-14 16:15:15 -07:00
parent fe9acfecb3
commit c113e3cbe7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/cc_test.go
View File

@@ -4371,8 +4371,8 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
"libarm", "libarm",
"lib32", "lib32",
"libandroid_arm", "libandroid_arm",
"defaults/cc/common/ndk_libandroid_support",
"defaults/cc/common/ndk_libc++_shared", "defaults/cc/common/ndk_libc++_shared",
"defaults/cc/common/ndk_libandroid_support",
"out/soong/ndk/sysroot/usr/include", "out/soong/ndk/sysroot/usr/include",
"out/soong/ndk/sysroot/usr/include/arm-linux-androideabi", "out/soong/ndk/sysroot/usr/include/arm-linux-androideabi",
"${config.NoOverrideClangGlobalCflags}", "${config.NoOverrideClangGlobalCflags}",

4
cc/stl.go
View File

@@ -199,7 +199,9 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps {
deps.StaticLibs = append(deps.StaticLibs, stl.Properties.SelectedStl, "ndk_libc++abi") deps.StaticLibs = append(deps.StaticLibs, stl.Properties.SelectedStl, "ndk_libc++abi")
} }
if needsLibAndroidSupport(ctx) { if needsLibAndroidSupport(ctx) {
deps.StaticLibs = append(deps.StaticLibs, "ndk_libandroid_support") // Use LateStaticLibs for ndk_libandroid_support so that its include directories
// come after ndk_libc++_static or ndk_libc++_shared.
deps.LateStaticLibs = append(deps.LateStaticLibs, "ndk_libandroid_support")
} }
deps.StaticLibs = append(deps.StaticLibs, "ndk_libunwind") deps.StaticLibs = append(deps.StaticLibs, "ndk_libunwind")
default: default: