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

Merge "Partial reverts of vndk-apex" am: 5bce0931c1 am: 908aa0cf74

Browse Source 
am: 4e7313bd3d

Change-Id: Ifd8bea7ff57cade100db68c9d2d31acf52f9e06f
This commit is contained in:
Greg Kaiser
2019-10-28 10:32:07 -07:00
committed by android-build-merger
parent dbb63d9cda 4e7313bd3d
commit d6a1e1caa9
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/androidmk.go
View File

@@ -93,11 +93,6 @@ func (c *Module) AndroidMk() android.AndroidMkData {
fmt.Fprintln(w, "LOCAL_USE_VNDK := true") fmt.Fprintln(w, "LOCAL_USE_VNDK := true")
if c.isVndk() && !c.static() { if c.isVndk() && !c.static() {
fmt.Fprintln(w, "LOCAL_SOONG_VNDK_VERSION := "+c.vndkVersion()) fmt.Fprintln(w, "LOCAL_SOONG_VNDK_VERSION := "+c.vndkVersion())
// VNDK libraries available to vendor are not installed because
// they are packaged in VNDK APEX and installed by APEX packages (apex/apex.go)
if !c.isVndkExt() {
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
}
} }
} }
}, },

2
cc/vndk.go
View File

@@ -301,7 +301,7 @@ func processVndkLibrary(mctx android.BottomUpMutatorContext, m *Module) {
if inList(name, vndkMustUseVendorVariantList(mctx.Config())) { if inList(name, vndkMustUseVendorVariantList(mctx.Config())) {
m.Properties.MustUseVendorVariant = true m.Properties.MustUseVendorVariant = true
} }
if mctx.DeviceConfig().VndkUseCoreVariant() && !m.mustUseVendorVariant() { if mctx.DeviceConfig().VndkUseCoreVariant() && !inList(name, vndkMustUseVendorVariantList(mctx.Config())) {
vndkUsingCoreVariantLibraries := vndkUsingCoreVariantLibraries(mctx.Config()) vndkUsingCoreVariantLibraries := vndkUsingCoreVariantLibraries(mctx.Config())
if !inList(name, *vndkUsingCoreVariantLibraries) { if !inList(name, *vndkUsingCoreVariantLibraries) {
*vndkUsingCoreVariantLibraries = append(*vndkUsingCoreVariantLibraries, name) *vndkUsingCoreVariantLibraries = append(*vndkUsingCoreVariantLibraries, name)