openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes from topics "target-build-unbundled", "unbundled-preopt" am: fa096325fe am: f80b698957 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324491

Change-Id: I18d5c7990c2a438287a420fe70428512df42ed97
This commit is contained in:
Martin Stjernholm 2020-06-11 10:43:13 +00:00 committed by Automerger Merge Worker
parent 1980e740c0 f80b698957
commit 85f583ac63
4 changed files with 4 additions and 13 deletions
Show Stats 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
}
if ctx.Config().UnbundledBuild() {
return true
}
if d.isTest {
return true
}

10
java/dexpreopt_bootjars.go
View File

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

1
ui/build/config.go
View File

@ -592,6 +592,7 @@ func (c *configImpl) Lunch(ctx Context, product, variant string) {
c.environ.Set("TARGET_BUILD_VARIANT", variant)
c.environ.Set("TARGET_BUILD_TYPE", "release")
c.environ.Unset("TARGET_BUILD_APPS")
c.environ.Unset("TARGET_BUILD_UNBUNDLED")
}
// Tapas configures the environment to build one or more unbundled apps,

2
ui/build/dumpvars.go
View File

@ -143,6 +143,7 @@ var BannerVars = []string{
"TARGET_BUILD_VARIANT",
"TARGET_BUILD_TYPE",
"TARGET_BUILD_APPS",
"TARGET_BUILD_UNBUNDLED",
"TARGET_ARCH",
"TARGET_ARCH_VARIANT",
"TARGET_CPU_VARIANT",
@ -187,6 +188,7 @@ func runMakeProductConfig(ctx Context, config Config) {
"TARGET_PRODUCT",
"TARGET_BUILD_VARIANT",
"TARGET_BUILD_APPS",
"TARGET_BUILD_UNBUNDLED",
// compiler wrappers set up by make
"CC_WRAPPER",