tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use prebuilt dx for PDK builds" am: 3615dcb30c

Browse source 
am: 9e4d063484

Change-Id: Iad94208b848514c1aad0665b8965ad115c742786
This commit is contained in:
Colin Cross 2017-10-24 20:25:17 +00:00 committed by android-build-merger
commit a2c4544626
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/config.go
View file

@ -496,6 +496,10 @@ func (c *config) UnbundledBuild() bool {
return Bool(c.ProductVariables.Unbundled_build) return Bool(c.ProductVariables.Unbundled_build)
} }
func (c *config) IsPdkBuild() bool {
return Bool(c.ProductVariables.Pdk)
}
func (c *config) DevicePrefer32BitExecutables() bool { func (c *config) DevicePrefer32BitExecutables() bool {
return Bool(c.ProductVariables.DevicePrefer32BitExecutables) return Bool(c.ProductVariables.DevicePrefer32BitExecutables)
} }

2
java/config/config.go
View file

@ -83,7 +83,7 @@ func init() {
if config.(android.Config).Getenv("USE_D8") == "true" { if config.(android.Config).Getenv("USE_D8") == "true" {
dexer = "d8" dexer = "d8"
} }
if config.(android.Config).UnbundledBuild() { if config.(android.Config).UnbundledBuild() || config.(android.Config).IsPdkBuild() {
return "prebuilts/build-tools/common/bin/" + dexer, nil return "prebuilts/build-tools/common/bin/" + dexer, nil
} else { } else {
path, err := pctx.HostBinToolPath(config, dexer) path, err := pctx.HostBinToolPath(config, dexer)