Preopt: Do not strip non-image boot class path jars.
Test: Pixel 2 XL boots.
Bug: 119868597
Change-Id: I7bd3b7655aecf1a8c26dd8d4d18d3eec685ece88
diff --git a/android/config.go b/android/config.go
index 38f6ec8..f5ea381 100644
--- a/android/config.go
+++ b/android/config.go
@@ -749,6 +749,14 @@
return c.productVariables.ModulesLoadedByPrivilegedModules
}
+func (c *config) BootJars() []string {
+ return c.productVariables.BootJars
+}
+
+func (c *config) PreoptBootJars() []string {
+ return c.productVariables.PreoptBootJars
+}
+
func (c *config) DisableDexPreopt(name string) bool {
return Bool(c.productVariables.DisableDexPreopt) || InList(name, c.productVariables.DisableDexPreoptModules)
}
diff --git a/android/variable.go b/android/variable.go
index 7e976cd..ddaf166 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -198,6 +198,9 @@
UncompressPrivAppDex *bool `json:",omitempty"`
ModulesLoadedByPrivilegedModules []string `json:",omitempty"`
+ BootJars []string `json:",omitempty"`
+ PreoptBootJars []string `json:",omitempty"`
+
DisableDexPreopt *bool `json:",omitempty"`
DisableDexPreoptModules []string `json:",omitempty"`
DexPreoptProfileDir *string `json:",omitempty"`