Merge "Allow bootjars in system_ext." am: 7097b0580c am: d82aae1f16

Change-Id: I3f0ce5311c84781799c9edf32e7f8f36993f3701
2020-05-05 21:33:58 +00:00 · 2020-05-05 21:33:58 +00:00 · c81742d9f7
parent b830eae4d2 d82aae1f16
commit c81742d9f7
1 changed files with 2 additions and 0 deletions
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@ -89,6 +89,8 @@ func getDexLocation(ctx android.PathContext, target android.Target, module strin
 		// 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")
 	}