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

Commit 516a1882 authored by Chun-Yi Lee's avatar Chun-Yi Lee Committed by Gerrit Code Review
Browse files

Merge "Revert "Add apex compat symlinks to LOCAL_SOONG_INSTALL_SYMLINKS"" into main

parents 4f53e941 0a693c5b

apex/androidmk.go

+0 −1
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { 
			if a.installable() {

				fmt.Fprintln(w, "LOCAL_SOONG_INSTALLED_MODULE :=", a.installedFile.String())

				fmt.Fprintln(w, "LOCAL_SOONG_INSTALL_PAIRS :=", a.outputFile.String()+":"+a.installedFile.String())

				fmt.Fprintln(w, "LOCAL_SOONG_INSTALL_SYMLINKS := ", strings.Join(a.compatSymlinks.Strings(), " "))

			}



			// Because apex writes .mk with Custom(), we need to write manually some common properties

apex/prebuilt.go

+0 −1
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries { 
					entries.SetString("LOCAL_MODULE_STEM", p.installFilename)

					entries.SetPath("LOCAL_SOONG_INSTALLED_MODULE", p.installedFile)

					entries.SetString("LOCAL_SOONG_INSTALL_PAIRS", p.outputApex.String()+":"+p.installedFile.String())

					entries.AddStrings("LOCAL_SOONG_INSTALL_SYMLINKS", p.compatSymlinks.Strings()...)

					entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", !p.installable())

					entries.AddStrings("LOCAL_OVERRIDES_MODULES", p.prebuiltCommonProperties.Overrides...)

					p.addRequiredModules(entries)