commit b01c114d27ce5dfc598c7fe8b663e7ed99e213f0
author Jooyung Han <jooyung@google.com> Tue Oct 29 05:24:42 2019 +0900
committer Jooyung Han <jooyung@google.com> Wed Oct 30 00:07:25 2019 +0000
tree 7d0e0c2a4ac6555beb775460c7fdad21de8c810a
parent 87a7f3064fd6738cbf55f1a462c731d9826d1eeb

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

cc/androidmk.go

diff --git a/cc/androidmk.go b/cc/androidmk.go
index 54cd722..91a3c99 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -93,6 +93,11 @@
 					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")
+						}
 					}
 				}
 			},