Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12d9f7a1 authored by Yo Chiang's avatar Yo Chiang
Browse files

Don't emit superfluous LOCAL_OVERRIDES_MODULES 

Don't emit an empty LOCAL_OVERRIDES_MODULES line if APEX is not
overriding any module.

Test: TH noop
Change-Id: I7abbaccd54bf2ffa25a6c798260c81284ea5ecb2
parent 000aef69

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, " "))

				}