StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Id93bcaea,Ia8f9f910

Browse Source 
* changes:
  Pass --remove-tools-declarations to manifest merger
  Don't use merged manifest for android_library modules
This commit is contained in:
Treehugger Robot
2019-04-25 14:47:37 +00:00
committed by Gerrit Code Review
parent 18805e483f aa1c6f1f5a
commit 02cbe8f1c6
3 changed files with 74 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/androidmk.go
View File

@@ -390,7 +390,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")