Merge "Don't emit superfluous LOCAL_OVERRIDES_MODULES" (f298a3f3) · Commits · e / os / android_build_soong

apex/androidmk.go

+6 −3

Original line number	Diff line number	Diff line
		@@ -233,8 +233,9 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
		for _, o := range a.overridableProperties.Overrides {
		patterns = append(patterns, "%."+o+a.suffix)
		}
		if len(patterns) > 0 {
		fmt.Fprintln(w, "LOCAL_OVERRIDES_MODULES :=", strings.Join(patterns, " "))

		}
		if len(a.compatSymlinks) > 0 {
		// For flattened apexes, compat symlinks are attached to apex_manifest.json which is guaranteed for every apex
		postInstallCommands = append(postInstallCommands, a.compatSymlinks...)
		@@ -307,7 +308,9 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData {
		fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", a.installDir.ToMakePath().String())
		fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", name+apexType.suffix())
		fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE :=", !a.installable())
		if len(a.overridableProperties.Overrides) > 0 {
		fmt.Fprintln(w, "LOCAL_OVERRIDES_MODULES :=", strings.Join(a.overridableProperties.Overrides, " "))
		}
		if len(moduleNames) > 0 {
		fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES +=", strings.Join(moduleNames, " "))
		}