Merge "Remove `use_apex_name_macro`" (ddf4ebae) · Commits · e / os / android_build_soong

apex/apex_test.go

+0 −30

Original line number	Diff line number	Diff line
		@@ -3183,7 +3183,6 @@ func TestMacro(t *testing.T) {
		"myapex",
		"otherapex",
		],
		use_apex_name_macro: true,
		recovery_available: true,
		min_sdk_version: "29",
		}
		@@ -3198,13 +3197,11 @@ func TestMacro(t *testing.T) {
		mylibCFlags = ctx.ModuleForTests("mylib", "android_arm64_armv8-a_static_apex10000").Rule("cc").Args["cFlags"]
		ensureContains(t, mylibCFlags, "-D__ANDROID_APEX__")
		ensureContains(t, mylibCFlags, "-D__ANDROID_APEX_MIN_SDK_VERSION__=10000")
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_MYAPEX__")

		// APEX variant has __ANDROID_APEX__ and __ANDROID_APEX_SDK__ defined
		mylibCFlags = ctx.ModuleForTests("mylib", "android_arm64_armv8-a_static_apex29").Rule("cc").Args["cFlags"]
		ensureContains(t, mylibCFlags, "-D__ANDROID_APEX__")
		ensureContains(t, mylibCFlags, "-D__ANDROID_APEX_MIN_SDK_VERSION__=29")
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_OTHERAPEX__")

		// When a cc_library sets use_apex_name_macro: true each apex gets a unique variant and
		// each variant defines additional macros to distinguish which apex variant it is built for
		@@ -3213,42 +3210,15 @@ func TestMacro(t *testing.T) {
		mylibCFlags = ctx.ModuleForTests("mylib3", "android_arm64_armv8-a_static").Rule("cc").Args["cFlags"]
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")

		// APEX variant has __ANDROID_APEX__ defined
		mylibCFlags = ctx.ModuleForTests("mylib3", "android_arm64_armv8-a_static_myapex").Rule("cc").Args["cFlags"]
		ensureContains(t, mylibCFlags, "-D__ANDROID_APEX__")
		ensureContains(t, mylibCFlags, "-D__ANDROID_APEX_MYAPEX__")
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_OTHERAPEX__")

		// APEX variant has __ANDROID_APEX__ defined
		mylibCFlags = ctx.ModuleForTests("mylib3", "android_arm64_armv8-a_static_otherapex").Rule("cc").Args["cFlags"]
		ensureContains(t, mylibCFlags, "-D__ANDROID_APEX__")
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_MYAPEX__")
		ensureContains(t, mylibCFlags, "-D__ANDROID_APEX_OTHERAPEX__")

		// recovery variant does not set __ANDROID_APEX_MIN_SDK_VERSION__
		mylibCFlags = ctx.ModuleForTests("mylib3", "android_recovery_arm64_armv8-a_static").Rule("cc").Args["cFlags"]
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_MIN_SDK_VERSION__")

		// When a dependency of a cc_library sets use_apex_name_macro: true each apex gets a unique
		// variant.

		// non-APEX variant does not have __ANDROID_APEX__ defined
		mylibCFlags = ctx.ModuleForTests("mylib2", "android_arm64_armv8-a_static").Rule("cc").Args["cFlags"]
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")

		// APEX variant has __ANDROID_APEX__ defined
		mylibCFlags = ctx.ModuleForTests("mylib2", "android_arm64_armv8-a_static_myapex").Rule("cc").Args["cFlags"]
		ensureContains(t, mylibCFlags, "-D__ANDROID_APEX__")
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_MYAPEX__")
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_OTHERAPEX__")

		// APEX variant has __ANDROID_APEX__ defined
		mylibCFlags = ctx.ModuleForTests("mylib2", "android_arm64_armv8-a_static_otherapex").Rule("cc").Args["cFlags"]
		ensureContains(t, mylibCFlags, "-D__ANDROID_APEX__")
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_MYAPEX__")
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_OTHERAPEX__")

		// recovery variant does not set __ANDROID_APEX_MIN_SDK_VERSION__
		mylibCFlags = ctx.ModuleForTests("mylib2", "android_recovery_arm64_armv8-a_static").Rule("cc").Args["cFlags"]
		ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")

cc/cc.go

+0 −10

Original line number	Diff line number	Diff line
		@@ -3249,16 +3249,6 @@ func (c *Module) TestFor() []string {
		return c.Properties.Test_for
		}

		func (c *Module) UniqueApexVariations() bool {
		if u, ok := c.compiler.(interface {
		uniqueApexVariations() bool
		}); ok {
		return u.uniqueApexVariations()
		} else {
		return false
		}
		}

		func (c *Module) EverInstallable() bool {
		return c.installer != nil &&
		// Check to see whether the module is actually ever installable.

cc/compiler.go

+0 −21

Original line number	Diff line number	Diff line
		@@ -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