diff options
| author | Colin Cross <ccross@android.com> | 2019-04-19 16:22:57 -0700 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-12-11 19:03:32 +0200 |
| commit | efcbabd6f7f9839ef69cd721d45027476540d42e (patch) | |
| tree | b848838758b28782c2f459a0edfa23dce12e6996 /java/androidmk.go | |
| parent | 5b5b4c9937d5926c1d48fae513d99d35763fb337 (diff) | |
| download | android_build_soong-efcbabd6f7f9839ef69cd721d45027476540d42e.tar.gz android_build_soong-efcbabd6f7f9839ef69cd721d45027476540d42e.tar.bz2 android_build_soong-efcbabd6f7f9839ef69cd721d45027476540d42e.zip | |
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 4f7a4b3b..b04f8050 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -381,7 +381,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") |