StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Define __ANDROID_VENDOR_API__" into main am: e0a5c5ae1d am: 2438f09e0d

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

Change-Id: I927659b82570b526c1b502871072315367e3ac9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-12-05 04:27:13 +00:00
committed by Automerger Merge Worker
parent e5994ccae1 2438f09e0d
commit b9555e56b0
5 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -1426,6 +1426,10 @@ func (c *config) IsVndkDeprecated() bool {
return !Bool(c.productVariables.KeepVndk) return !Bool(c.productVariables.KeepVndk)
} }
func (c *config) VendorApiLevel() string {
return String(c.productVariables.VendorApiLevel)
}
func (c *deviceConfig) Arches() []Arch { func (c *deviceConfig) Arches() []Arch {
var arches []Arch var arches []Arch
for _, target := range c.config.Targets[Android] { for _, target := range c.config.Targets[Android] {

2
android/variable.go
View File

@@ -226,6 +226,8 @@ type ProductVariables struct {
DeviceMaxPageSizeSupported *string `json:",omitempty"` DeviceMaxPageSizeSupported *string `json:",omitempty"`
DevicePageSizeAgnostic *bool `json:",omitempty"` DevicePageSizeAgnostic *bool `json:",omitempty"`
VendorApiLevel *string `json:",omitempty"`
RecoverySnapshotVersion *string `json:",omitempty"` RecoverySnapshotVersion *string `json:",omitempty"`
DeviceSecondaryArch *string `json:",omitempty"` DeviceSecondaryArch *string `json:",omitempty"`

3
cc/cc_test.go
View File

@@ -40,6 +40,7 @@ func TestMain(m *testing.M) {
var prepareForCcTest = android.GroupFixturePreparers( var prepareForCcTest = android.GroupFixturePreparers(
PrepareForTestWithCcIncludeVndk, PrepareForTestWithCcIncludeVndk,
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
variables.VendorApiLevel = StringPtr("202404")
variables.DeviceVndkVersion = StringPtr("current") variables.DeviceVndkVersion = StringPtr("current")
variables.Platform_vndk_version = StringPtr("29") 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_VNDK__")
ensureStringContains(t, vendor_cflags, "-D__ANDROID_VENDOR__") ensureStringContains(t, vendor_cflags, "-D__ANDROID_VENDOR__")
ensureStringNotContains(t, vendor_cflags, "-D__ANDROID_PRODUCT__") ensureStringNotContains(t, vendor_cflags, "-D__ANDROID_PRODUCT__")
ensureStringContains(t, vendor_cflags, "-D__ANDROID_VENDOR_API__=202404")
product_cflags := product_static.Rule("cc").Args["cFlags"] product_cflags := product_static.Rule("cc").Args["cFlags"]
ensureStringContains(t, product_cflags, "-D__ANDROID_VNDK__") ensureStringContains(t, product_cflags, "-D__ANDROID_VNDK__")
ensureStringContains(t, product_cflags, "-D__ANDROID_PRODUCT__") ensureStringContains(t, product_cflags, "-D__ANDROID_PRODUCT__")
ensureStringNotContains(t, product_cflags, "-D__ANDROID_VENDOR__") ensureStringNotContains(t, product_cflags, "-D__ANDROID_VENDOR__")
ensureStringNotContains(t, product_cflags, "-D__ANDROID_VENDOR_API__=202404")
} }
func TestEnforceProductVndkVersionErrors(t *testing.T) { func TestEnforceProductVndkVersionErrors(t *testing.T) {

9
cc/compiler.go
View File

@@ -406,6 +406,15 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_VNDK__") flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_VNDK__")
if ctx.inVendor() { if ctx.inVendor() {
flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_VENDOR__") 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() { } else if ctx.inProduct() {
flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_PRODUCT__") flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_PRODUCT__")
} }

9
rust/bindgen.go
View File

@@ -174,6 +174,15 @@ func (b *bindgenDecorator) GenerateSource(ctx ModuleContext, deps PathDeps) andr
cflags = append(cflags, "-D__ANDROID_VNDK__") cflags = append(cflags, "-D__ANDROID_VNDK__")
if ctx.RustModule().InVendor() { if ctx.RustModule().InVendor() {
cflags = append(cflags, "-D__ANDROID_VENDOR__") 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() { } else if ctx.RustModule().InProduct() {
cflags = append(cflags, "-D__ANDROID_PRODUCT__") cflags = append(cflags, "-D__ANDROID_PRODUCT__")
} }