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 "Add WithDexpreopt soong variable" am: eb120bd741 am: 3c4cb3e99b 

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

Change-Id: I6819e50aa0ce4c01b8f52a8ff90222c99e0a6e38
This commit is contained in:
Inseob Kim 2021-03-24 07:04:02 +00:00 committed by Automerger Merge Worker
parent c61b745b49 3c4cb3e99b
commit df6015f661
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@ -1005,6 +1005,10 @@ func (c *config) DexpreoptGlobalConfig(ctx PathContext) ([]byte, error) {
return ioutil.ReadFile(absolutePath(path.String())) return ioutil.ReadFile(absolutePath(path.String()))
} }
func (c *deviceConfig) WithDexpreopt() bool {
return c.config.productVariables.WithDexpreopt
}
func (c *config) FrameworksBaseDirExists(ctx PathContext) bool { func (c *config) FrameworksBaseDirExists(ctx PathContext) bool {
return ExistentPathForSource(ctx, "frameworks", "base", "Android.bp").Valid() return ExistentPathForSource(ctx, "frameworks", "base", "Android.bp").Valid()
} }

2
android/variable.go
View File

@ -341,6 +341,8 @@ type productVariables struct {
DexpreoptGlobalConfig *string `json:",omitempty"` DexpreoptGlobalConfig *string `json:",omitempty"`
WithDexpreopt bool `json:",omitempty"`
ManifestPackageNameOverrides []string `json:",omitempty"` ManifestPackageNameOverrides []string `json:",omitempty"`
CertificateOverrides []string `json:",omitempty"` CertificateOverrides []string `json:",omitempty"`
PackageNameOverrides []string `json:",omitempty"` PackageNameOverrides []string `json:",omitempty"`