summaryrefslogtreecommitdiff
path: root/java/dexpreopt_config.go
diff options
context:
space:
mode:
author Chris Gross <chrisgross@google.com> 2020-05-05 21:12:39 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-05-05 21:12:39 +0000
commit7097b0580cee5c55a2f90658270d49eb3b074877 (patch)
tree863cfb6042da608e6d66b9837eccb344176ed455 /java/dexpreopt_config.go
parent39298b3598eae7b5f9fb746fc078abf276a948f0 (diff)
parent06c8036ac87e55403030c5f567c19e77690e1d54 (diff)
Merge "Allow bootjars in system_ext."
Diffstat (limited to 'java/dexpreopt_config.go')
-rw-r--r--java/dexpreopt_config.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index 92c96e2e3..41a2ca794 100644
--- 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")
}