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

Revert "Don't depend on nonexistent manifest when manifest_check is disabled."

Browse Source 
This reverts commit a76d6606ce.

Reason for revert: broken build 7215516 on git_sc-dev \
  on aosp_blueline-userdebug

Bug: 183010666
Change-Id: I52f00c9f4712dc5716be527cacd085b9f6e6e65a
Test: treehugger
This commit is contained in:
Ulyana Trafimovich
2021-03-17 18:51:09 +00:00
committed by Ulya Trafimovich
parent a801072f60
commit 7c6c1f5c8b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/app.go
View File

@@ -1286,7 +1286,7 @@ func (u *usesLibrary) freezeEnforceUsesLibraries() {
// an APK with the manifest embedded in it (manifest_check will know which one it is by the file // an APK with the manifest embedded in it (manifest_check will know which one it is by the file
// extension: APKs are supposed to end with '.apk'). // extension: APKs are supposed to end with '.apk').
func (u *usesLibrary) verifyUsesLibraries(ctx android.ModuleContext, inputFile android.Path, func (u *usesLibrary) verifyUsesLibraries(ctx android.ModuleContext, inputFile android.Path,
outputFile android.WritablePath) android.Path { outputFile android.WritablePath) {
statusFile := dexpreopt.UsesLibrariesStatusFile(ctx) statusFile := dexpreopt.UsesLibrariesStatusFile(ctx)
@@ -1295,7 +1295,7 @@ func (u *usesLibrary) verifyUsesLibraries(ctx android.ModuleContext, inputFile a
// non-linux build platforms where dexpreopt is generally disabled (the check may fail due to // non-linux build platforms where dexpreopt is generally disabled (the check may fail due to
// various unrelated reasons, such as a failure to get manifest from an APK). // various unrelated reasons, such as a failure to get manifest from an APK).
if dexpreopt.GetGlobalConfig(ctx).DisablePreopt { if dexpreopt.GetGlobalConfig(ctx).DisablePreopt {
return inputFile return
} }
rule := android.NewRuleBuilder(pctx, ctx) rule := android.NewRuleBuilder(pctx, ctx)
@@ -1322,14 +1322,14 @@ func (u *usesLibrary) verifyUsesLibraries(ctx android.ModuleContext, inputFile a
} }
rule.Build("verify_uses_libraries", "verify <uses-library>") rule.Build("verify_uses_libraries", "verify <uses-library>")
return outputFile
} }
// verifyUsesLibrariesManifest checks the <uses-library> tags in an AndroidManifest.xml against // verifyUsesLibrariesManifest checks the <uses-library> tags in an AndroidManifest.xml against
// the build system and returns the path to a copy of the manifest. // the build system and returns the path to a copy of the manifest.
func (u *usesLibrary) verifyUsesLibrariesManifest(ctx android.ModuleContext, manifest android.Path) android.Path { func (u *usesLibrary) verifyUsesLibrariesManifest(ctx android.ModuleContext, manifest android.Path) android.Path {
outputFile := android.PathForModuleOut(ctx, "manifest_check", "AndroidManifest.xml") outputFile := android.PathForModuleOut(ctx, "manifest_check", "AndroidManifest.xml")
return u.verifyUsesLibraries(ctx, manifest, outputFile) u.verifyUsesLibraries(ctx, manifest, outputFile)
return outputFile
} }
// verifyUsesLibrariesAPK checks the <uses-library> tags in the manifest of an APK against the build // verifyUsesLibrariesAPK checks the <uses-library> tags in the manifest of an APK against the build