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

Commit 74656ccf authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Don't write license data to Android-${TARGET_PRODUCT}.mk" into main

parents 5ca7b8ed a16bd6b7

android/androidmk.go

+0 −20
Original line number Diff line number Diff line
@@ -486,17 +486,6 @@ func (a *AndroidMkEntries) GetDistForGoals(mod blueprint.Module) []string { 
	return generateDistContributionsForMake(distContributions)

}



// Write the license variables to Make for AndroidMkData.Custom(..) methods that do not call WriteAndroidMkData(..)

// It's required to propagate the license metadata even for module types that have non-standard interfaces to Make.

func (a *AndroidMkEntries) WriteLicenseVariables(w io.Writer) {

	AndroidMkEmitAssignList(w, "LOCAL_LICENSE_KINDS", a.EntryMap["LOCAL_LICENSE_KINDS"])

	AndroidMkEmitAssignList(w, "LOCAL_LICENSE_CONDITIONS", a.EntryMap["LOCAL_LICENSE_CONDITIONS"])

	AndroidMkEmitAssignList(w, "LOCAL_NOTICE_FILE", a.EntryMap["LOCAL_NOTICE_FILE"])

	if pn, ok := a.EntryMap["LOCAL_LICENSE_PACKAGE_NAME"]; ok {

		AndroidMkEmitAssignList(w, "LOCAL_LICENSE_PACKAGE_NAME", pn)

	}

}



// fillInEntries goes through the common variable processing and calls the extra data funcs to

// generate and fill in AndroidMkEntries's in-struct data, ready to be flushed to a file.

type fillInEntriesContext interface {
@@ -534,15 +523,6 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint 
	// Collect make variable assignment entries.

	a.SetString("LOCAL_PATH", ctx.ModuleDir(mod))

	a.SetString("LOCAL_MODULE", name+a.SubName)

	a.AddStrings("LOCAL_LICENSE_KINDS", base.commonProperties.Effective_license_kinds...)

	a.AddStrings("LOCAL_LICENSE_CONDITIONS", base.commonProperties.Effective_license_conditions...)

	a.AddStrings("LOCAL_NOTICE_FILE", base.commonProperties.Effective_license_text.Strings()...)

	// TODO(b/151177513): Does this code need to set LOCAL_MODULE_IS_CONTAINER ?

	if base.commonProperties.Effective_package_name != nil {

		a.SetString("LOCAL_LICENSE_PACKAGE_NAME", *base.commonProperties.Effective_package_name)

	} else if len(base.commonProperties.Effective_licenses) > 0 {

		a.SetString("LOCAL_LICENSE_PACKAGE_NAME", strings.Join(base.commonProperties.Effective_licenses, " "))

	}

	a.SetString("LOCAL_MODULE_CLASS", a.Class)

	a.SetString("LOCAL_PREBUILT_MODULE_FILE", a.OutputFile.String())

	a.AddStrings("LOCAL_REQUIRED_MODULES", a.Required...)

apex/androidmk.go

+0 −1
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { 
			fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)  # apex.apexBundle")

			fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)

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

			data.Entries.WriteLicenseVariables(w)

			fmt.Fprintln(w, "LOCAL_MODULE_CLASS := ETC") // do we need a new class?

			fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", a.outputFile.String())

			fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", a.installDir.String())

bpf/bpf.go

+0 −2
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ func (bpf *bpf) AndroidMk() android.AndroidMkData { 
				names = append(names, objName)

				fmt.Fprintln(w, "include $(CLEAR_VARS)", " # bpf.bpf.obj")

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

				data.Entries.WriteLicenseVariables(w)

				fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", obj.String())

				fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", obj.Base())

				fmt.Fprintln(w, "LOCAL_MODULE_CLASS := ETC")
@@ -239,7 +238,6 @@ func (bpf *bpf) AndroidMk() android.AndroidMkData { 
			}

			fmt.Fprintln(w, "include $(CLEAR_VARS)", " # bpf.bpf")

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

			data.Entries.WriteLicenseVariables(w)

			android.AndroidMkEmitAssignList(w, "LOCAL_REQUIRED_MODULES", names)

			fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)")

		},

phony/phony.go

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ func (p *phony) AndroidMk() android.AndroidMkData { 
			fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)", " # phony.phony")

			fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)

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

			data.Entries.WriteLicenseVariables(w)

			if p.Host() {

				fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")

			}

sysprop/sysprop_library.go

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ func (m *syspropLibrary) AndroidMk() android.AndroidMkData { 
			// Actual implementation libraries are created on LoadHookMutator

			fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)", " # sysprop.syspropLibrary")

			fmt.Fprintln(w, "LOCAL_MODULE :=", m.Name())

			data.Entries.WriteLicenseVariables(w)

			fmt.Fprintf(w, "LOCAL_MODULE_CLASS := FAKE\n")

			fmt.Fprintf(w, "LOCAL_MODULE_TAGS := optional\n")

			fmt.Fprintf(w, "include $(BUILD_SYSTEM)/base_rules.mk\n\n")