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
This commit is contained in:
parent
e72e1ff98b
commit
ea581fc95d
2 changed files with 2 additions and 2 deletions
|
@ -87,7 +87,7 @@ func TestDexpreoptBootJars(t *testing.T) {
|
|||
ruleFile := "boot-foo.art"
|
||||
|
||||
expectedInputs := []string{
|
||||
"dex_artjars/android/apex/com.android.art/javalib/arm64/boot.art",
|
||||
"dex_artjars/android/apex/art_boot_images/javalib/arm64/boot.art",
|
||||
"dex_bootjars_input/foo.jar",
|
||||
"dex_bootjars_input/bar.jar",
|
||||
"dex_bootjars_input/baz.jar",
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue