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

Define __ANDROID_VENDOR__ and __ANDROID_PRODUCT__

Browse Source 
__ANDROID_VNDK__ is defined for the modules that are able to use the
VNDK libraries. As both product and vendor variants define
__ANDROID_VNDK__, we don't know if a module is built for vendor or
product on build time.

__ANDROID_VENDOR__ and __ANDROID_PRODUCT__ macros can be used to
specify the image-variant-dependent codes.

Bug: 180646847
Test: m nothing
Change-Id: Id6c3e1e3d47deaf3684c0c02964718658cf2fec5
This commit is contained in:
Justin Yun
2021-03-08 19:25:55 +09:00
parent aa52d66cd5
commit 13decfb0bb
3 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cc/cc_test.go
View File

@@ -2065,6 +2065,7 @@ func TestEnforceProductVndkVersion(t *testing.T) {
vendor_available: true,
product_available: true,
nocrt: true,
srcs: ["foo.c"],
target: {
vendor: {
suffix: "-vendor",
@@ -2108,12 +2109,7 @@ func TestEnforceProductVndkVersion(t *testing.T) {
}
`
config := TestConfig(buildDir, android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.ProductVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
ctx := testCcWithConfig(t, config)
ctx := ccFixtureFactory.RunTestWithBp(t, bp).TestContext
checkVndkModule(t, ctx, "libvndk", "", false, "", productVariant)
checkVndkModule(t, ctx, "libvndk_sp", "", true, "", productVariant)
@@ -2123,6 +2119,33 @@ func TestEnforceProductVndkVersion(t *testing.T) {
mod_product := ctx.ModuleForTests("libboth_available", productVariant).Module().(*Module)
assertString(t, mod_product.outputFile.Path().Base(), "libboth_available-product.so")
ensureStringContains := func(t *testing.T, str string, substr string) {
t.Helper()
if !strings.Contains(str, substr) {
t.Errorf("%q is not found in %v", substr, str)
}
}
ensureStringNotContains := func(t *testing.T, str string, substr string) {
t.Helper()
if strings.Contains(str, substr) {
t.Errorf("%q is found in %v", substr, str)
}
}
// _static variant is used since _shared reuses *.o from the static variant
vendor_static := ctx.ModuleForTests("libboth_available", strings.Replace(vendorVariant, "_shared", "_static", 1))
product_static := ctx.ModuleForTests("libboth_available", strings.Replace(productVariant, "_shared", "_static", 1))
vendor_cflags := vendor_static.Rule("cc").Args["cFlags"]
ensureStringContains(t, vendor_cflags, "-D__ANDROID_VNDK__")
ensureStringContains(t, vendor_cflags, "-D__ANDROID_VENDOR__")
ensureStringNotContains(t, vendor_cflags, "-D__ANDROID_PRODUCT__")
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__")
}
func TestEnforceProductVndkVersionErrors(t *testing.T) {