diff options
| author | 2020-10-14 23:29:49 +0100 | |
|---|---|---|
| committer | 2020-10-19 20:42:46 +0100 | |
| commit | ea581fc95d86a17dfe6d2a95e55499e764c5a5cf (patch) | |
| tree | ed3a08740edfa03cbd1aa55aced602664522e095 /java/dexpreopt_config.go | |
| parent | e72e1ff98bf8ecce74463fad58efbec7d197767c (diff) | |
Move the intermediate directory for ART boot images.
Free up the directory $(PRODUCT_OUT)/apex/com.android.art for the
release ART APEX. Without this we'll get conflicting install paths in
make.
Test: build/soong/soong_ui.bash --make-mode \
TARGET_PRODUCT=sdk_x86_64 TARGET_BUILD_VARIANT=userdebug nothing
with http://r.android.com/q/topic:release-apex-rename+author:mast
present to rename the ART release APEX to com.android.art.
Test: Build & boot on CF
Test: apct/device_boot_test and asit/perf/boottime_test on
blueline_jitzygote-userdebug
Test: avd/avd_boot_health_check on cf_x86_phone-userdebug_coverage_art
Bug: 169639321
Change-Id: I0b263d5922d438834e5c804e55f69a2a1421ab73
Merged-In: I0b263d5922d438834e5c804e55f69a2a1421ab73
Diffstat (limited to 'java/dexpreopt_config.go')
| -rw-r--r-- | java/dexpreopt_config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index f0d82ff92..0f8888a7d 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -89,7 +89,7 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { frameworkModules := global.BootJars.CopyOf() frameworkModules.RemoveList(artModules) - artSubdir := "apex/com.android.art/javalib" + artSubdir := "apex/art_boot_images/javalib" frameworkSubdir := "system/framework" // ART config for the primary boot image in the ART apex. |