diff options
| author | 2019-04-19 16:22:57 -0700 | |
|---|---|---|
| committer | 2019-04-24 14:40:14 -0700 | |
| commit | 90c25c689392a265c85d382152a938cae092623c (patch) | |
| tree | 1f3b8b1eb19525b197f513d5c2d2cc53b9706936 /java/androidmk.go | |
| parent | 28c3eb6829f6516ff3bb94d8c59ecd0b8ff16f17 (diff) | |
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
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 304b1c42d..7aa9a6198 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -386,7 +386,7 @@ func (a *AndroidLibrary) AndroidMk() android.AndroidMkData { 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") |