openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Treehugger Robot 2019-02-14 00:26:42 +00:00 committed by Gerrit Code Review
parent 1acd4475f2 f1801bc0a5
commit e9433ca127
1 changed files with 3 additions and 3 deletions
Show Stats 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{} moduleNames := []string{}
for _, fi := range a.filesInfo { 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, "\ninclude $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
fmt.Fprintln(w, "LOCAL_MODULE :=", fi.moduleName) fmt.Fprintln(w, "LOCAL_MODULE :=", fi.moduleName)
if a.flattened { if a.flattened && apexType.image() {
// /system/apex/<name>/{lib|framework|...} // /system/apex/<name>/{lib|framework|...}
fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", filepath.Join("$(OUT_DIR)", fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", filepath.Join("$(OUT_DIR)",
a.installDir.RelPathString(), name, fi.installDir)) 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) { Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
moduleNames := []string{} moduleNames := []string{}
if a.installable() { if a.installable() {
moduleNames = a.androidMkForFiles(w, name, moduleDir) moduleNames = a.androidMkForFiles(w, name, moduleDir, apexType)
} }
if a.flattened && apexType.image() { if a.flattened && apexType.image() {