StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Enforce <uses-library> checks for android_app and android_app_import."

Browse Source 
This reverts commit 22890c466e.

Reason for revert: Broken build 7065627 on git_rvc-qpr-dev-plus-aosp
  on aosp_sunfish-userdebug branch.

Bug: 176892941
Test: treehugger
Change-Id: I0f5da13644fd2ec7b0472fe82918e3c6a72d953c
This commit is contained in:
Ulyana Trafimovich
2021-01-06 15:09:40 +00:00
parent 35efc7221d
commit c2b6b65d73
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/app.go
View File

@@ -905,8 +905,6 @@ func AndroidAppFactory() android.Module {
&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 @@ type UsesLibraryProperties struct {
// 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) classLoaderContextForUsesLibDeps(ctx android.ModuleContext
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`.