Merge "Allow bootjars in system_ext." am: 7097b0580c am: d82aae1f16
Change-Id: I3f0ce5311c84781799c9edf32e7f8f36993f3701
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index 92c96e2..41a2ca7 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -89,6 +89,8 @@
// Special apex name "platform" denotes jars do not come from an apex, but are part
// of the platform. Such jars are installed on the /system partition on device.
subdir = "system/framework"
+ } else if apex == "system_ext" {
+ subdir = "system_ext/framework"
} else {
subdir = filepath.Join("apex", apex, "javalib")
}