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

Merge "apex: set ":vndk" as required for vendor apexes" am: b0c4d3b319 am: feb217de25 am: db457de0dd am: 3efdf3d287

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1376856

Change-Id: Ibd1131ab30257603f35f4f5aa8f9572d0568f4b2
This commit is contained in:
Jooyung Han
2020-07-30 01:05:19 +00:00
committed by Automerger Merge Worker
parent 7a9a310386 3efdf3d287
commit 69676d264e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/apex.go
View File

@@ -2257,10 +2257,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
return false
}
if cc.UseVndk() && proptools.Bool(a.properties.Use_vndk_as_stable) && cc.IsVndk() {
// For vendor APEX with use_vndk_as_stable: true, we don't include VNDK libs
// and use them from VNDK APEX.
// TODO(b/159576928): add "vndk" as requiredDeps so that linkerconfig can make "vndk"
// linker namespace avaiable to this apex.
requireNativeLibs = append(requireNativeLibs, ":vndk")
return false
}
af := apexFileForNativeLibrary(ctx, cc, handleSpecialLibs)

8
apex/apex_test.go
View File

@@ -2201,6 +2201,10 @@ func TestVendorApex(t *testing.T) {
data.Custom(&builder, name, prefix, "", data)
androidMk := builder.String()
ensureContains(t, androidMk, `LOCAL_MODULE_PATH := /tmp/target/product/test_device/vendor/apex`)
apexManifestRule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("apexManifestRule")
requireNativeLibs := names(apexManifestRule.Args["requireNativeLibs"])
ensureListNotContains(t, requireNativeLibs, ":vndk")
}
func TestVendorApex_use_vndk_as_stable(t *testing.T) {
@@ -2250,6 +2254,10 @@ func TestVendorApex_use_vndk_as_stable(t *testing.T) {
"bin/mybin",
"lib64/libvendor.so",
})
apexManifestRule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("apexManifestRule")
requireNativeLibs := names(apexManifestRule.Args["requireNativeLibs"])
ensureListContains(t, requireNativeLibs, ":vndk")
}
func TestAndroidMk_UseVendorRequired(t *testing.T) {