aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 05:31:20 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 05:31:20 +0000
commitc7aa2e313ec4fccbcde9ed6e9267e7515694a2b2 (patch)
tree299efbccc7f71daa67253b5d436c4bcdfaeddf9e
parent6a15bf93aa65ada18c8d6ed36dd1dcc2757ae19e (diff)
parent1487d3a350538efd795d41e681242d363bdbc2f9 (diff)
downloadaidl-aml_tz5_341510010.tar.gz
Snap for 10453563 from 1487d3a350538efd795d41e681242d363bdbc2f9 to mainline-tzdata5-releaseaml_tz5_341510050aml_tz5_341510010aml_tz5_341510010
Change-Id: I750b1684450e0ce9f1086852e64d2ea7dc94c1ad
-rw-r--r--build/aidl_interface.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/aidl_interface.go b/build/aidl_interface.go
index 1f0fef8a..0330ed1e 100644
--- a/build/aidl_interface.go
+++ b/build/aidl_interface.go
@@ -1212,19 +1212,19 @@ func (i *aidlInterface) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
javaConfig = &javaConfigAttributes{}
javaConfig.Enabled = true
javaConfig.Min_sdk_version = i.minSdkVersion(langJava)
- javaConfig.Tags = android.ConvertApexAvailableToTags(i.properties.Backend.Java.Apex_available)
+ javaConfig.Tags = android.ConvertApexAvailableToTagsWithoutTestApexes(ctx, i.properties.Backend.Java.Apex_available)
}
if i.shouldGenerateCppBackend() {
cppConfig = &cppConfigAttributes{}
cppConfig.Enabled = true
cppConfig.Min_sdk_version = i.minSdkVersion(langCpp)
- cppConfig.Tags = android.ConvertApexAvailableToTags(i.properties.Backend.Cpp.Apex_available)
+ cppConfig.Tags = android.ConvertApexAvailableToTagsWithoutTestApexes(ctx, i.properties.Backend.Cpp.Apex_available)
}
if i.shouldGenerateNdkBackend() {
ndkConfig = &ndkConfigAttributes{}
ndkConfig.Enabled = true
ndkConfig.Min_sdk_version = i.minSdkVersion(langNdk)
- ndkConfig.Tags = android.ConvertApexAvailableToTags(i.properties.Backend.Ndk.Apex_available)
+ ndkConfig.Tags = android.ConvertApexAvailableToTagsWithoutTestApexes(ctx, i.properties.Backend.Ndk.Apex_available)
}
imports := getBazelLabelListForImports(ctx, i.properties.Imports)