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

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

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

Change-Id: I0964289e33d6f567eff69fc80a1f08ba24f77f68
This commit is contained in:
Martin Stjernholm
2020-06-11 10:26:08 +00:00
committed by Automerger Merge Worker
parent 4019a06c3c fa096325fe
commit f80b698957
4 changed files with 4 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 {

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_VARIANT", variant)
c.environ.Set("TARGET_BUILD_TYPE", "release") c.environ.Set("TARGET_BUILD_TYPE", "release")
c.environ.Unset("TARGET_BUILD_APPS") c.environ.Unset("TARGET_BUILD_APPS")
c.environ.Unset("TARGET_BUILD_UNBUNDLED")
} }
// Tapas configures the environment to build one or more unbundled apps, // 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_VARIANT",
"TARGET_BUILD_TYPE", "TARGET_BUILD_TYPE",
"TARGET_BUILD_APPS", "TARGET_BUILD_APPS",
"TARGET_BUILD_UNBUNDLED",
"TARGET_ARCH", "TARGET_ARCH",
"TARGET_ARCH_VARIANT", "TARGET_ARCH_VARIANT",
"TARGET_CPU_VARIANT", "TARGET_CPU_VARIANT",
@@ -187,6 +188,7 @@ func runMakeProductConfig(ctx Context, config Config) {
"TARGET_PRODUCT", "TARGET_PRODUCT",
"TARGET_BUILD_VARIANT", "TARGET_BUILD_VARIANT",
"TARGET_BUILD_APPS", "TARGET_BUILD_APPS",
"TARGET_BUILD_UNBUNDLED",
// compiler wrappers set up by make // compiler wrappers set up by make
"CC_WRAPPER", "CC_WRAPPER",