Revert "Don't depend on nonexistent manifest when manifest_check is disabled."
This reverts commit a76d6606ce8e43f5b4a15a7ff21471f9f83d3d9d.
Reason for revert: broken build 7215516 on git_sc-dev \
on aosp_blueline-userdebug
Bug: 183010666
Change-Id: I52f00c9f4712dc5716be527cacd085b9f6e6e65a
Test: treehugger
diff --git a/java/app.go b/java/app.go
index 1b6e0e3..3ef31d5 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1286,7 +1286,7 @@
// 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').
func (u *usesLibrary) verifyUsesLibraries(ctx android.ModuleContext, inputFile android.Path,
- outputFile android.WritablePath) android.Path {
+ outputFile android.WritablePath) {
statusFile := dexpreopt.UsesLibrariesStatusFile(ctx)
@@ -1295,7 +1295,7 @@
// 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).
if dexpreopt.GetGlobalConfig(ctx).DisablePreopt {
- return inputFile
+ return
}
rule := android.NewRuleBuilder(pctx, ctx)
@@ -1322,14 +1322,14 @@
}
rule.Build("verify_uses_libraries", "verify <uses-library>")
- return outputFile
}
// verifyUsesLibrariesManifest checks the <uses-library> tags in an AndroidManifest.xml against
// 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 {
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