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

Commit 2438f09e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Define __ANDROID_VENDOR_API__" into main am: e0a5c5ae 

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



Change-Id: Ifc6b5f90684bf74f85bfe5c301572a48eb6552e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4e59d2f e0a5c5ae

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -1426,6 +1426,10 @@ func (c *config) IsVndkDeprecated() bool { 
	return !Bool(c.productVariables.KeepVndk)

}



func (c *config) VendorApiLevel() string {

	return String(c.productVariables.VendorApiLevel)

}



func (c *deviceConfig) Arches() []Arch {

	var arches []Arch

	for _, target := range c.config.Targets[Android] {

android/variable.go

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ type ProductVariables struct { 
	DeviceMaxPageSizeSupported            *string  `json:",omitempty"`

	DevicePageSizeAgnostic                *bool    `json:",omitempty"`



	VendorApiLevel *string `json:",omitempty"`



	RecoverySnapshotVersion *string `json:",omitempty"`



	DeviceSecondaryArch        *string  `json:",omitempty"`

cc/cc_test.go

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ func TestMain(m *testing.M) { 
var prepareForCcTest = android.GroupFixturePreparers(

	PrepareForTestWithCcIncludeVndk,

	android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {

		variables.VendorApiLevel = StringPtr("202404")

		variables.DeviceVndkVersion = StringPtr("current")

		variables.Platform_vndk_version = StringPtr("29")

	}),
@@ -2131,11 +2132,13 @@ func TestEnforceProductVndkVersion(t *testing.T) { 
	ensureStringContains(t, vendor_cflags, "-D__ANDROID_VNDK__")

	ensureStringContains(t, vendor_cflags, "-D__ANDROID_VENDOR__")

	ensureStringNotContains(t, vendor_cflags, "-D__ANDROID_PRODUCT__")

	ensureStringContains(t, vendor_cflags, "-D__ANDROID_VENDOR_API__=202404")



	product_cflags := product_static.Rule("cc").Args["cFlags"]

	ensureStringContains(t, product_cflags, "-D__ANDROID_VNDK__")

	ensureStringContains(t, product_cflags, "-D__ANDROID_PRODUCT__")

	ensureStringNotContains(t, product_cflags, "-D__ANDROID_VENDOR__")

	ensureStringNotContains(t, product_cflags, "-D__ANDROID_VENDOR_API__=202404")

}



func TestEnforceProductVndkVersionErrors(t *testing.T) {

cc/compiler.go

+9 −0
Original line number Diff line number Diff line
@@ -406,6 +406,15 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 
		flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_VNDK__")

		if ctx.inVendor() {

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



			vendorApiLevel := ctx.Config().VendorApiLevel()

			if vendorApiLevel == "" {

				// TODO(b/314036847): This is a fallback for UDC targets.

				// This must be a build failure when UDC is no longer built

				// from this source tree.

				vendorApiLevel = ctx.Config().PlatformSdkVersion().String()

			}

			flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_VENDOR_API__="+vendorApiLevel)

		} else if ctx.inProduct() {

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

		}

rust/bindgen.go

+9 −0
Original line number Diff line number Diff line
@@ -174,6 +174,15 @@ func (b *bindgenDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) andr 
		cflags = append(cflags, "-D__ANDROID_VNDK__")

		if ctx.RustModule().InVendor() {

			cflags = append(cflags, "-D__ANDROID_VENDOR__")



			vendorApiLevel := ctx.Config().VendorApiLevel()

			if vendorApiLevel == "" {

				// TODO(b/314036847): This is a fallback for UDC targets.

				// This must be a build failure when UDC is no longer built

				// from this source tree.

				vendorApiLevel = ctx.Config().PlatformSdkVersion().String()

			}

			cflags = append(cflags, "-D__ANDROID_VENDOR_API__="+vendorApiLevel)

		} else if ctx.RustModule().InProduct() {

			cflags = append(cflags, "-D__ANDROID_PRODUCT__")

		}