StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't disable dexpreopting implicitly in unbundled builds.

Browse Source 
Test: art/test/testrunner/run_build_test_target.py art-linux-bionic-x64
  with TARGET_BUILD_UNBUNDLED enabled in the build scripts
Test: art/test/testrunner/testrunner.py --target --64 --optimizing
  with TARGET_BUILD_UNBUNDLED enabled in chroot on device
Bug: 157549171
Change-Id: I124c341d1801c4afa22f836dd567019de3e9498e
This commit is contained in:
Martin Stjernholm
2020-06-04 13:03:41 +01:00
parent 08802338fb
commit 95d6ea3781
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/dexpreopt.go
View File

@@ -77,10 +77,6 @@ func (d *dexpreopter) dexpreoptDisabled(ctx android.BaseModuleContext) bool {
return true return true
} }
if ctx.Config().UnbundledBuild() {
return true
}
if d.isTest { if d.isTest {
return true return true
} }

10
java/dexpreopt_bootjars.go
View File

@@ -179,15 +179,7 @@ func RegisterDexpreoptBootJarsComponents(ctx android.RegistrationContext) {
} }
func skipDexpreoptBootJars(ctx android.PathContext) bool { func skipDexpreoptBootJars(ctx android.PathContext) bool {
if dexpreopt.GetGlobalConfig(ctx).DisablePreopt { return dexpreopt.GetGlobalConfig(ctx).DisablePreopt
return true
}
if ctx.Config().UnbundledBuild() {
return true
}
return false
} }
type dexpreoptBootJars struct { type dexpreoptBootJars struct {