diff options
Diffstat (limited to 'cc/compiler.go')
| -rw-r--r-- | cc/compiler.go | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/cc/compiler.go b/cc/compiler.go index 4f96712e6..2ac7bf332 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -209,15 +209,6 @@ 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 { @@ -291,10 +282,6 @@ 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 += "/" @@ -405,10 +392,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps if ctx.apexVariationName() != "" { flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_APEX__") - 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, fmt.Sprintf("-D__ANDROID_APEX_MIN_SDK_VERSION__=%d", @@ -634,10 +617,6 @@ func (compiler *baseCompiler) hasSrcExt(ext string) bool { return false } -func (compiler *baseCompiler) uniqueApexVariations() bool { - return compiler.useApexNameMacro() -} - var invalidDefineCharRegex = regexp.MustCompile("[^a-zA-Z0-9_]") // makeDefineString transforms a name of an APEX module into a value to be used as value for C define |