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 "apex: pass "apex name" as literal to apex variants" am: d1ac3a79e0 

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

Change-Id: I44b34edae5122fa674ec81e81ef1809e48109edf
This commit is contained in:
Treehugger Robot 2020-08-27 00:10:52 +00:00 committed by Automerger Merge Worker
parent bf49e6e7fc d1ac3a79e0
commit 613222477c
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cc/compiler.go
View File

@ -189,8 +189,14 @@ type BaseCompilerProperties struct {
// Build and link with OpenMP
Openmp *bool `android:"arch_variant"`
// Deprecated.
// Adds __ANDROID_APEX_<APEX_MODULE_NAME>__ macro defined for apex variants in addition to __ANDROID_APEX__
Use_apex_name_macro *bool
// Adds two macros for apex variants in addition to __ANDROID_APEX__
// * __ANDROID_APEX_COM_ANDROID_FOO__
// * __ANDROID_APEX_NAME__="com.android.foo"
UseApexNameMacro bool `blueprint:"mutated"`
}
func NewBaseCompiler() *baseCompiler {
@ -254,6 +260,10 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps {
return deps
}
func (compiler *baseCompiler) useApexNameMacro() bool {
return Bool(compiler.Properties.Use_apex_name_macro) || compiler.Properties.UseApexNameMacro
}
// Return true if the module is in the WarningAllowedProjects.
func warningsAreAllowed(subdir string) bool {
subdir += "/"
@ -337,8 +347,9 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
if ctx.apexVariationName() != "" {
flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_APEX__")
if Bool(compiler.Properties.Use_apex_name_macro) {
if compiler.useApexNameMacro() {
flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_APEX_"+makeDefineString(ctx.apexVariationName())+"__")
flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_APEX_NAME__='\""+ctx.apexVariationName()+"\"'")
}
if ctx.Device() {
flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_SDK_VERSION__="+strconv.Itoa(ctx.apexSdkVersion()))
@ -557,7 +568,7 @@ func (compiler *baseCompiler) hasSrcExt(ext string) bool {
}
func (compiler *baseCompiler) uniqueApexVariations() bool {
return Bool(compiler.Properties.Use_apex_name_macro)
return compiler.useApexNameMacro()
}
// makeDefineString transforms a name of an APEX module into a value to be used as value for C define