Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9754735 authored by Vinh Tran's avatar Vinh Tran
Browse files

Delete __ANDROID_APEX_MIN_SDK_VERSION__ from Soong 

Currently, Bazel sets __ANDROID_APEX_MIN_SDK_VERSION__ based on the cc library's min_sdk_version while Soong does based on apex's min_sdk_version. This causes a diff in the clang commands.

Digging further, we realized __ANDROID_APEX_MIN_SDK_VERSION__ isn't used anywhere so we might just delete it altogether instead of fixing it.

Bug: 265134933
Test: presubmit
Change-Id: I08e89dc8f6ef86669248ea5c47de6603e9d2ffbb
parent 733b1b78

apex/apex_test.go

+4 −9
Original line number Diff line number Diff line
@@ -3329,17 +3329,14 @@ func TestMacro(t *testing.T) { 
	// non-APEX variant does not have __ANDROID_APEX__ defined

	mylibCFlags := ctx.ModuleForTests("mylib", "android_arm64_armv8-a_static").Rule("cc").Args["cFlags"]

	ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")

	ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX_MIN_SDK_VERSION__")



	// APEX variant has __ANDROID_APEX__ and __ANDROID_APEX_SDK__ defined

	// APEX variant has __ANDROID_APEX__ and __ANDROID_APEX__ defined

	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")



	// APEX variant has __ANDROID_APEX__ and __ANDROID_APEX_SDK__ defined

	// APEX variant has __ANDROID_APEX__ and __ANDROID_APEX__ 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")



	// 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
@@ -3348,19 +3345,17 @@ func TestMacro(t *testing.T) { 
	mylibCFlags = ctx.ModuleForTests("mylib3", "android_arm64_armv8-a_static").Rule("cc").Args["cFlags"]

	ensureNotContains(t, mylibCFlags, "-D__ANDROID_APEX__")



	// recovery variant does not set __ANDROID_APEX_MIN_SDK_VERSION__

	// recovery variant does not set __ANDROID_APEX__

	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__")



	// 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__")



	// recovery variant does not set __ANDROID_APEX_MIN_SDK_VERSION__

	// recovery variant does not set __ANDROID_APEX__

	mylibCFlags = ctx.ModuleForTests("mylib2", "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__")

}



func TestHeaderLibsDependency(t *testing.T) {

cc/compiler.go

+0 −5
Original line number Diff line number Diff line
@@ -416,11 +416,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 


	if ctx.apexVariationName() != "" {

		flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_APEX__")

		if ctx.Device() {

			flags.Global.CommonFlags = append(flags.Global.CommonFlags,

				fmt.Sprintf("-D__ANDROID_APEX_MIN_SDK_VERSION__=%d",

					ctx.apexSdkVersion().FinalOrFutureInt()))

		}

	}



	if ctx.Target().NativeBridge == android.NativeBridgeEnabled {

rust/bindgen.go

+0 −5
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
package rust



import (

	"fmt"

	"strings"



	"github.com/google/blueprint"
@@ -178,10 +177,6 @@ func (b *bindgenDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) andr 


	if mctx, ok := ctx.(*moduleContext); ok && mctx.apexVariationName() != "" {

		cflags = append(cflags, "-D__ANDROID_APEX__")

		if ctx.Device() {

			cflags = append(cflags, fmt.Sprintf("-D__ANDROID_APEX_MIN_SDK_VERSION__=%d",

				ctx.RustModule().apexSdkVersion.FinalOrFutureInt()))

		}

	}



	if ctx.Target().NativeBridge == android.NativeBridgeEnabled {