Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a76d6606 authored by Ulya Trafimovich's avatar Ulya Trafimovich
Browse files

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

This is a follow-up for https://android-review.googlesource.com/1614807.

Bug: 132357300
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Test: lunch qemu_trusty_arm64-userdebug && \
  m out/soong/.intermediates/packages/apps/DocumentsUI/DocumentsUI/android_common/DocumentsUI-unsigned.apk
Change-Id: I84c5d171bd976f35f342abd94b592506c71e4b1d
parent 2002bfa8

java/app.go

+4 −4
Original line number Diff line number Diff line
@@ -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

// extension: APKs are supposed to end with '.apk').

func (u *usesLibrary) verifyUsesLibraries(ctx android.ModuleContext, inputFile android.Path,

	outputFile android.WritablePath) {

	outputFile android.WritablePath) android.Path {



	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

	// various unrelated reasons, such as a failure to get manifest from an APK).

	if dexpreopt.GetGlobalConfig(ctx).DisablePreopt {

		return

		return inputFile

	}



	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>")

	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")

	u.verifyUsesLibraries(ctx, manifest, outputFile)

	return outputFile

	return u.verifyUsesLibraries(ctx, manifest, outputFile)

}



// verifyUsesLibrariesAPK checks the <uses-library> tags in the manifest of an APK against the build