summaryrefslogtreecommitdiff
path: root/apex/apex_test.go
diff options
context:
space:
mode:
author Justin Yun <justinyun@google.com> 2023-09-27 16:22:10 +0900
committer Justin Yun <justinyun@google.com> 2023-09-27 16:36:40 +0900
commitaf1fde43f96196a191db326048cf04d64346877e (patch)
treeabf46eaf50c8ba0ed68f06644cc2f16b1efa814a /apex/apex_test.go
parentc5b9abba309e4bb65e6ae69c60b44d0f4b59e278 (diff)
Generate product variants by default
PRODUCT_PRODUCT_VNDK_VERSION is set to 'current' by default. Now, we can generate product variants without checking the PRODUCT_PRODUCT_VNDK_VERSION build variable. Remove reading the PRODUCT_PRODUCT_VNDK_VERSION variable from soong and generate product variants by default. Bug: 302255959 Test: m Change-Id: I9a9b2076f4367c5ce9a393bbb206f8dee3884bd8
Diffstat (limited to 'apex/apex_test.go')
-rw-r--r--apex/apex_test.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 9475f5da3..8069c51fa 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -3088,10 +3088,7 @@ func TestProductVariant(t *testing.T) {
apex_available: ["myapex"],
srcs: ["foo.cpp"],
}
- `, android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
- variables.ProductVndkVersion = proptools.StringPtr("current")
- }),
- )
+ `)
cflags := strings.Fields(
ctx.ModuleForTests("foo", "android_product.29_arm64_armv8-a_myapex").Rule("cc").Args["cFlags"])
@@ -10521,6 +10518,7 @@ func TestTrimmedApex(t *testing.T) {
min_sdk_version: "29",
recovery_available: true,
vendor_available: true,
+ product_available: true,
}
api_imports {
name: "api_imports",