diff options
author | 2023-05-10 18:38:34 +0100 | |
---|---|---|
committer | 2023-05-11 19:04:17 +0100 | |
commit | c08c162b5a82ddfc44e9944d798636b2241308de (patch) | |
tree | c45d7ab59494cf0b013c3fdb44fa03c39d57326a /java/dexpreopt_config.go | |
parent | 09d88df0407263e846b01c226184b262f2e36678 (diff) |
Dexpreopt ART jars and framework jars together.
Bug: 280776428
Test: atest art_standalone_dexpreopt_tests
Test: -
1. m
2. Check .invocation file (http://gpaste/6498044089466880)
3. Check files in $ANDROID_PRODUCT_OUT/system/framework/x86_64
Test: -
1. m dist
2. Check files in out/dist/boot.zip
Test: -
1. art/tools/buildbot-build.sh --host
2. m test-art-host-gtest
3. art/test/testrunner/testrunner.py --host
Test: m build-art-target-golem
Change-Id: I89490252e56a05edab03fdddc6539fa4d7f79756
Diffstat (limited to 'java/dexpreopt_config.go')
-rw-r--r-- | java/dexpreopt_config.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 5f168e70a..9100e87c6 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -53,7 +53,7 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig global := dexpreopt.GetGlobalConfig(ctx) artModules := global.ArtApexJars - frameworkModules := global.BootJars.RemoveList(artModules) + frameworkModules := global.BootJars // This includes `artModules`. mainlineBcpModules := global.ApexBootJars frameworkSubdir := "system/framework" @@ -73,7 +73,6 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig // Framework config for the boot image extension. // It includes framework libraries and depends on the ART config. frameworkCfg := bootImageConfig{ - extends: &artCfg, name: frameworkBootImageName, stem: bootImageStem, installDir: frameworkSubdir, @@ -81,6 +80,7 @@ func genBootImageConfigRaw(ctx android.PathContext) map[string]*bootImageConfig preloadedClassesFile: "frameworks/base/config/preloaded-classes", compilerFilter: "speed-profile", singleImage: false, + profileImports: []*bootImageConfig{&artCfg}, } mainlineCfg := bootImageConfig{ |