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

Merge "Ensure that make doesn't flatten zipapex files."

Browse Source 
am: e9433ca127

Change-Id: Ia6ad052aac395ded1992cd50973810c42ddea8c6
This commit is contained in:
Alex Light
2019-02-13 16:51:07 -08:00
committed by android-build-merger
parent fd183f3742 e9433ca127
commit 89f43f6549
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/apex.go
View File

@@ -1029,7 +1029,7 @@ func (a *apexBundle) AndroidMk() android.AndroidMkData {
}}
}
func (a *apexBundle) androidMkForFiles(w io.Writer, name, moduleDir string) []string {
func (a *apexBundle) androidMkForFiles(w io.Writer, name, moduleDir string, apexType apexPackaging) []string {
moduleNames := []string{}
for _, fi := range a.filesInfo {
@@ -1042,7 +1042,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, name, moduleDir string) []st
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
fmt.Fprintln(w, "LOCAL_MODULE :=", fi.moduleName)
if a.flattened {
if a.flattened && apexType.image() {
// /system/apex/<name>/{lib|framework|...}
fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", filepath.Join("$(OUT_DIR)",
a.installDir.RelPathString(), name, fi.installDir))
@@ -1111,7 +1111,7 @@ func (a *apexBundle) androidMkForType(apexType apexPackaging) android.AndroidMkD
Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
moduleNames := []string{}
if a.installable() {
moduleNames = a.androidMkForFiles(w, name, moduleDir)
moduleNames = a.androidMkForFiles(w, name, moduleDir, apexType)
}
if a.flattened && apexType.image() {