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

Commit 62783652 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Propagate owner property for apex modules" into rvc-dev am: ff1531e1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12034797

Change-Id: I478d0442eee9e1eee74a853d51f21f797f2aeec0
parents 7df01cc0 ff1531e1

android/module.go

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ type Module interface { 
	Disable()

	Enabled() bool

	Target() Target

	Owner() string

	InstallInData() bool

	InstallInTestcases() bool

	InstallInSanitizerDir() bool

apex/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
			fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)

		}

		fmt.Fprintln(w, "LOCAL_MODULE :=", moduleName)

		if fi.module != nil && fi.module.Owner() != "" {

			fmt.Fprintln(w, "LOCAL_MODULE_OWNER :=", fi.module.Owner())

		}

		// /apex/<apex_name>/{lib|framework|...}

		pathWhenActivated := filepath.Join("$(PRODUCT_OUT)", "apex", apexName, fi.installDir)

		if apexType == flattenedApex {