commit f21c797f38b9b402527e52bb01d9a2eadc96991b
author Jooyung Han <jooyung@google.com> Mon Dec 16 22:32:06 2019 +0900
committer Jooyung Han <jooyung@google.com> Mon Dec 16 13:36:34 2019 +0000
tree 10691383fd92832b5d6b9c5078cf81398e9365bb
parent 0f41daf682c76f99585c7e6594840bcb4e950bf6

Support apps attribute in apex_defaults

Adding overridableProperties to apex_defaults as well.

Bug: 146217017
Test: m
Change-Id: I51182fec25ee589fea4006164c4dd69acc5ba67d

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index be86d80..727b2f7 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -483,9 +483,11 @@
 
 	properties            apexBundleProperties
 	targetProperties      apexTargetBundleProperties
-	vndkProperties        apexVndkProperties
 	overridableProperties overridableProperties
 
+	// specific to apex_vndk modules
+	vndkProperties apexVndkProperties
+
 	bundleModuleFile android.WritablePath
 	outputFile       android.WritablePath
 	installDir       android.InstallPath
@@ -1273,6 +1275,7 @@
 	module.AddProperties(
 		&apexBundleProperties{},
 		&apexTargetBundleProperties{},
+		&overridableProperties{},
 	)
 
 	android.InitDefaultsModule(module)