Merge "Ensure that make doesn't flatten zipapex files." (e9433ca1) · Commits · e / os / android_build_soong

apex/apex.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -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() {