commit 90c25c689392a265c85d382152a938cae092623c
author Colin Cross <ccross@android.com> Fri Apr 19 16:22:57 2019 -0700
committer Colin Cross <ccross@android.com> Wed Apr 24 14:40:14 2019 -0700
tree 1f3b8b1eb19525b197f513d5c2d2cc53b9706936
parent 28c3eb6829f6516ff3bb94d8c59ecd0b8ff16f17

Don't use merged manifest for android_library modules

Don't use the merged manifest for android_library modules.  We
still have to run manifest merger for android_library modules
because Make can't handle transitive dependencies, so it will
continue to merge the manifests at each library, and then merge
the manifests of direct dependencies into the final application.

Bug: 113294940
Test: m checkbuild
Change-Id: Ia8f9f910bd0a134730ddf2d542460eeddbc0a075

java/androidmk.go

diff --git a/java/androidmk.go b/java/androidmk.go
index 304b1c4..7aa9a61 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -386,7 +386,7 @@
 
 		fmt.Fprintln(w, "LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=", a.exportPackage.String())
 		fmt.Fprintln(w, "LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES :=", a.extraAaptPackagesFile.String())
-		fmt.Fprintln(w, "LOCAL_FULL_MANIFEST_FILE :=", a.manifestPath.String())
+		fmt.Fprintln(w, "LOCAL_FULL_MANIFEST_FILE :=", a.mergedManifestFile.String())
 		fmt.Fprintln(w, "LOCAL_SOONG_EXPORT_PROGUARD_FLAGS :=",
 			strings.Join(a.exportedProguardFlagFiles.Strings(), " "))
 		fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")