summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2019-10-29 05:24:42 +0900
committer Jooyung Han <jooyung@google.com> 2019-10-30 00:07:25 +0000
commitb01c114d27ce5dfc598c7fe8b663e7ed99e213f0 (patch)
tree7d0e0c2a4ac6555beb775460c7fdad21de8c810a
parent87a7f3064fd6738cbf55f1a462c731d9826d1eeb (diff)
Do not install VNDK lib in favor of VNDK APEX
Since VNDK APEX replaces VNDK lib /system/lib/vndk{-sp}, VNDK libs are not installed. Bug: 141451661 Test: m && boot device Change-Id: I14686927a56ded5176839c89f29a2fd7e0fca658
-rw-r--r--cc/androidmk.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go
index 54cd722f4..91a3c99ac 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -93,6 +93,11 @@ func (c *Module) AndroidMk() android.AndroidMkData {
fmt.Fprintln(w, "LOCAL_USE_VNDK := true")
if c.IsVndk() && !c.static() {
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")
+ }
}
}
},