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

Commit 5c4729df authored by Sasha Smundak's avatar Sasha Smundak
Browse files

Show module type in a module section of the Android-TARGET.mk 

The first line of each section will be
```
include $(CLEAR_VARS)  # <module type>
...
```

Bug: 257037252
Test: treehugger
Change-Id: Iba586155b682fe4e1e5817d8397eda8f9d9c8789
parent 62ed3dd5

android/androidmk.go

+2 −1
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ type fillInEntriesContext interface { 
	Config() Config

	ModuleProvider(module blueprint.Module, provider blueprint.ProviderKey) interface{}

	ModuleHasProvider(module blueprint.Module, provider blueprint.ProviderKey) bool

	ModuleType(module blueprint.Module) string

}



func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint.Module) {
@@ -527,7 +528,7 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint 
		fmt.Fprintf(&a.header, distString)

	}



	fmt.Fprintln(&a.header, "\ninclude $(CLEAR_VARS)")

	fmt.Fprintln(&a.header, "\ninclude $(CLEAR_VARS)  # "+ctx.ModuleType(mod))



	// Collect make variable assignment entries.

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

apex/androidmk.go

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
			continue

		}



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

		fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)  # apex.apexBundle.files")

		if fi.moduleDir != "" {

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

		} else {
@@ -348,7 +348,7 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { 


			if apexType == flattenedApex {

				// Only image APEXes can be flattened.

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

				fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)  # apex.apexBundle.flat")

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

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

				data.Entries.WriteLicenseVariables(w)
@@ -356,7 +356,7 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { 
				fmt.Fprintln(w, "include $(BUILD_PHONY_PACKAGE)")



			} else {

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

				fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)  # apex.apexBundle")

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

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

				data.Entries.WriteLicenseVariables(w)

bpf/bpf.go

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ func (bpf *bpf) AndroidMk() android.AndroidMkData { 
			for _, obj := range bpf.objs {

				objName := name + "_" + obj.Base()

				names = append(names, objName)

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

				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())
@@ -237,7 +237,7 @@ func (bpf *bpf) AndroidMk() android.AndroidMkData { 
				fmt.Fprintln(w, "include $(BUILD_PREBUILT)")

				fmt.Fprintln(w)

			}

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

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

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

			data.Entries.WriteLicenseVariables(w)

			fmt.Fprintln(w, "LOCAL_REQUIRED_MODULES :=", strings.Join(names, " "))

java/robolectric.go

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ func (r *robolectricTest) AndroidMkEntries() []android.AndroidMkEntries { 


func (r *robolectricTest) writeTestRunner(w io.Writer, module, name string, tests []string) {

	fmt.Fprintln(w, "")

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

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

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

	fmt.Fprintln(w, "LOCAL_JAVA_LIBRARIES :=", module)

	fmt.Fprintln(w, "LOCAL_JAVA_LIBRARIES += ", strings.Join(r.libs, " "))

phony/phony.go

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ func (p *phony) GenerateAndroidBuildActions(ctx android.ModuleContext) { 
func (p *phony) AndroidMk() android.AndroidMkData {

	return android.AndroidMkData{

		Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {

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

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

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

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

			data.Entries.WriteLicenseVariables(w)