Merge "Add memtag_heap notes to allowed deps." am: 8b638ad78e am: f9f472e739
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1548884
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d719b47d62e216c756ce20d618809d0cd3f2669
diff --git a/apex/allowed_deps.txt b/apex/allowed_deps.txt
index c11a89c..8f5ef4f 100644
--- a/apex/allowed_deps.txt
+++ b/apex/allowed_deps.txt
@@ -342,6 +342,7 @@
libmedia_headers(minSdkVersion:29)
libmedia_helper_headers(minSdkVersion:29)
libmedia_midiiowrapper(minSdkVersion:29)
+libmediaparser-jni(minSdkVersion:29)
libmidiextractor(minSdkVersion:29)
libminijail(minSdkVersion:29)
libminijail_gen_constants(minSdkVersion:(no version))
@@ -589,6 +590,7 @@
Tethering(minSdkVersion:current)
TetheringApiCurrentLib(minSdkVersion:30)
TetheringApiCurrentLib(minSdkVersion:current)
+TetheringGoogle(minSdkVersion:30)
TetheringGoogle(minSdkVersion:current)
textclassifier-statsd(minSdkVersion:current)
TextClassifierNotificationLibNoManifest(minSdkVersion:29)
diff --git a/java/app.go b/java/app.go
index e6c9a2d..e9597d7 100755
--- a/java/app.go
+++ b/java/app.go
@@ -905,8 +905,6 @@
&module.appProperties,
&module.overridableAppProperties)
- module.usesLibrary.enforce = true
-
android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
android.InitOverridableModule(module, &module.appProperties.Overrides)
@@ -1177,9 +1175,6 @@
// with knowledge of their shared libraries.
type usesLibrary struct {
usesLibraryProperties UsesLibraryProperties
-
- // Whether to enforce verify_uses_library check.
- enforce bool
}
func (u *usesLibrary) addLib(lib string, optional bool) {
@@ -1246,7 +1241,7 @@
func (u *usesLibrary) enforceUsesLibraries() bool {
defaultEnforceUsesLibs := len(u.usesLibraryProperties.Uses_libs) > 0 ||
len(u.usesLibraryProperties.Optional_uses_libs) > 0
- return BoolDefault(u.usesLibraryProperties.Enforce_uses_libs, u.enforce || defaultEnforceUsesLibs)
+ return BoolDefault(u.usesLibraryProperties.Enforce_uses_libs, defaultEnforceUsesLibs)
}
// Freeze the value of `enforce_uses_libs` based on the current values of `uses_libs` and `optional_uses_libs`.
diff --git a/java/app_import.go b/java/app_import.go
index df940f1..2054785 100644
--- a/java/app_import.go
+++ b/java/app_import.go
@@ -430,8 +430,6 @@
android.InitDefaultableModule(module)
android.InitSingleSourcePrebuiltModule(module, &module.properties, "Apk")
- module.usesLibrary.enforce = true
-
return module
}
diff --git a/java/app_import_test.go b/java/app_import_test.go
index 344d23b..3b55c81 100644
--- a/java/app_import_test.go
+++ b/java/app_import_test.go
@@ -182,31 +182,31 @@
name: "no preferred",
aaptPreferredConfig: nil,
aaptPrebuiltDPI: []string{},
- expected: "verify_uses_libraries/apk/app.apk",
+ expected: "prebuilts/apk/app.apk",
},
{
name: "AAPTPreferredConfig matches",
aaptPreferredConfig: proptools.StringPtr("xhdpi"),
aaptPrebuiltDPI: []string{"xxhdpi", "ldpi"},
- expected: "verify_uses_libraries/apk/app_xhdpi.apk",
+ expected: "prebuilts/apk/app_xhdpi.apk",
},
{
name: "AAPTPrebuiltDPI matches",
aaptPreferredConfig: proptools.StringPtr("mdpi"),
aaptPrebuiltDPI: []string{"xxhdpi", "xhdpi"},
- expected: "verify_uses_libraries/apk/app_xxhdpi.apk",
+ expected: "prebuilts/apk/app_xxhdpi.apk",
},
{
name: "non-first AAPTPrebuiltDPI matches",
aaptPreferredConfig: proptools.StringPtr("mdpi"),
aaptPrebuiltDPI: []string{"ldpi", "xhdpi"},
- expected: "verify_uses_libraries/apk/app_xhdpi.apk",
+ expected: "prebuilts/apk/app_xhdpi.apk",
},
{
name: "no matches",
aaptPreferredConfig: proptools.StringPtr("mdpi"),
aaptPrebuiltDPI: []string{"ldpi", "xxxhdpi"},
- expected: "verify_uses_libraries/apk/app.apk",
+ expected: "prebuilts/apk/app.apk",
},
}
@@ -225,7 +225,7 @@
if len(matches) != 2 {
t.Errorf("failed to extract the src apk path from %q", jniRuleCommand)
}
- if strings.HasSuffix(matches[1], test.expected) {
+ if test.expected != matches[1] {
t.Errorf("wrong src apk, expected: %q got: %q", test.expected, matches[1])
}
}
@@ -302,7 +302,7 @@
},
}
`,
- expected: "verify_uses_libraries/apk/app_arm64.apk",
+ expected: "prebuilts/apk/app_arm64.apk",
},
{
name: "no matching arch",
@@ -321,7 +321,7 @@
},
}
`,
- expected: "verify_uses_libraries/apk/app.apk",
+ expected: "prebuilts/apk/app.apk",
},
{
name: "no matching arch without default",
@@ -359,7 +359,7 @@
if len(matches) != 2 {
t.Errorf("failed to extract the src apk path from %q", jniRuleCommand)
}
- if strings.HasSuffix(matches[1], test.expected) {
+ if test.expected != matches[1] {
t.Errorf("wrong src apk, expected: %q got: %q", test.expected, matches[1])
}
}