From 06c8036ac87e55403030c5f567c19e77690e1d54 Mon Sep 17 00:00:00 2001 From: Chris Gross Date: Fri, 1 May 2020 16:14:54 -0700 Subject: [PATCH] Allow bootjars in system_ext. Bug: 148385042 Test: Built and booted Pixel 3a both with and without a boot jar in system_ext. Change-Id: I0702aa8259478a71cf96a5cd3a425071ccdafdfb --- java/dexpreopt_config.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index d849dc2a8..add2e68e5 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") }