Snap for 10460766 from 1487d3a350538efd795d41e681242d363bdbc2f9 to mainline-healthfitness-release
Change-Id: Iea39486aefe62d13aa95790f47ceeb1109755271
diff --git a/build/aidl_interface.go b/build/aidl_interface.go
index 1f0fef8..0330ed1 100644
--- a/build/aidl_interface.go
+++ b/build/aidl_interface.go
@@ -1212,19 +1212,19 @@
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)
