aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-08 04:42:39 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-08 04:42:39 +0000
commit689f95ef007a28405f244a8c5f7c561cb37c5e47 (patch)
tree299efbccc7f71daa67253b5d436c4bcdfaeddf9e
parent0eae04cf88ae03ca4a2e06f9612a69e79a955576 (diff)
parent1487d3a350538efd795d41e681242d363bdbc2f9 (diff)
downloadaidl-android14-mainline-healthfitness-release.tar.gz
Snap for 10460766 from 1487d3a350538efd795d41e681242d363bdbc2f9 to mainline-healthfitness-releaseaml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-mainline-healthfitness-release
Change-Id: Iea39486aefe62d13aa95790f47ceeb1109755271
-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)