Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c113e3cb authored by Colin Cross's avatar Colin Cross
Browse files

Use LateStaticLibs for ndk_libandroid_support 

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
parent fe9acfec

cc/cc_test.go

+1 −1
Original line number Diff line number Diff line
@@ -4371,8 +4371,8 @@ func TestIncludeDirectoryOrdering(t *testing.T) { 
		"libarm",

		"lib32",

		"libandroid_arm",

		"defaults/cc/common/ndk_libandroid_support",

		"defaults/cc/common/ndk_libc++_shared",

		"defaults/cc/common/ndk_libandroid_support",

		"out/soong/ndk/sysroot/usr/include",

		"out/soong/ndk/sysroot/usr/include/arm-linux-androideabi",

		"${config.NoOverrideClangGlobalCflags}",

cc/stl.go

+3 −1
Original line number Diff line number Diff line
@@ -199,7 +199,9 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps { 
			deps.StaticLibs = append(deps.StaticLibs, stl.Properties.SelectedStl, "ndk_libc++abi")

		}

		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")

	default: