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

Commit 2ed99d00 authored by Jooyung Han's avatar Jooyung Han
Browse files

apex: AndroidMk writes common properties 

AndroidMkEntries handles bunch of common properties(e.g. LOCAL_INIT_RC,
LOCAL_VINTF_FRAGMENTS, etc).

However apex defines its own Custom() writer, so those properties should
be handled manually.

For example, when an apex defines "init_rc" properties, the value should
be passed to Make via LOCAL_INIT_RC.

Bug: 159211312
Test: m
Change-Id: I65e7a456486c9f5fe70c91b78ff181425035fcf2
parent dd85fd89

android/androidmk.go

+9 −11
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ type AndroidMkData struct { 


	Extra []AndroidMkExtraFunc



	preamble bytes.Buffer

	Entries AndroidMkEntries

}



type AndroidMkExtraFunc func(w io.Writer, outputFile Path)
@@ -427,7 +427,7 @@ func translateGoBinaryModule(ctx SingletonContext, w io.Writer, mod blueprint.Mo 


func (data *AndroidMkData) fillInData(config Config, bpPath string, mod blueprint.Module) {

	// Get the preamble content through AndroidMkEntries logic.

	entries := AndroidMkEntries{

	data.Entries = AndroidMkEntries{

		Class:           data.Class,

		SubName:         data.SubName,

		DistFile:        data.DistFile,
@@ -438,16 +438,12 @@ func (data *AndroidMkData) fillInData(config Config, bpPath string, mod blueprin 
		Host_required:   data.Host_required,

		Target_required: data.Target_required,

	}

	entries.fillInEntries(config, bpPath, mod)



	// preamble doesn't need the footer content.

	entries.footer = bytes.Buffer{}

	entries.write(&data.preamble)

	data.Entries.fillInEntries(config, bpPath, mod)



	// copy entries back to data since it is used in Custom

	data.Required = entries.Required

	data.Host_required = entries.Host_required

	data.Target_required = entries.Target_required

	data.Required = data.Entries.Required

	data.Host_required = data.Entries.Host_required

	data.Target_required = data.Entries.Target_required

}



func translateAndroidModule(ctx SingletonContext, w io.Writer, mod blueprint.Module,
@@ -503,7 +499,9 @@ func WriteAndroidMkData(w io.Writer, data AndroidMkData) { 
		return

	}



	w.Write(data.preamble.Bytes())

	// write preamble via Entries

	data.Entries.footer = bytes.Buffer{}

	data.Entries.write(w)



	for _, extra := range data.Extra {

		extra(w, data.OutputFile.Path())

apex/androidmk.go

+15 −8
Original line number Diff line number Diff line
@@ -33,14 +33,7 @@ func (a *apexBundle) AndroidMk() android.AndroidMkData { 
			Disabled: true,

		}

	}

	writers := []android.AndroidMkData{}

	writers = append(writers, a.androidMkForType())

	return android.AndroidMkData{

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

			for _, data := range writers {

				data.Custom(w, name, prefix, moduleDir, data)

			}

		}}

	return a.androidMkForType()

}



func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, moduleDir string) []string {
@@ -308,6 +301,20 @@ 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())



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

				// which are available via data.Entries

				commonProperties := []string{

					"LOCAL_INIT_RC", "LOCAL_VINTF_FRAGMENTS",

					"LOCAL_PROPRIETARY_MODULE", "LOCAL_VENDOR_MODULE", "LOCAL_ODM_MODULE", "LOCAL_PRODUCT_MODULE", "LOCAL_SYSTEM_EXT_MODULE",

					"LOCAL_MODULE_OWNER",

				}

				for _, name := range commonProperties {

					if value, ok := data.Entries.EntryMap[name]; ok {

						fmt.Fprintln(w, name+" := "+strings.Join(value, " "))

					}

				}



				if len(a.overridableProperties.Overrides) > 0 {

					fmt.Fprintln(w, "LOCAL_OVERRIDES_MODULES :=", strings.Join(a.overridableProperties.Overrides, " "))

				}

apex/apex_test.go

+29 −0
Original line number Diff line number Diff line
@@ -2161,6 +2161,35 @@ func TestUseVendorFailsIfNotVendorAvailable(t *testing.T) { 
	`)

}



func TestAndroidMkWritesCommonProperties(t *testing.T) {

	ctx, config := testApex(t, `

		apex {

			name: "myapex",

			key: "myapex.key",

			vintf_fragments: ["fragment.xml"],

			init_rc: ["init.rc"],

		}

		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}

		cc_binary {

			name: "mybin",

		}

	`)



	apexBundle := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(*apexBundle)

	data := android.AndroidMkDataForTest(t, config, "", apexBundle)

	name := apexBundle.BaseModuleName()

	prefix := "TARGET_"

	var builder strings.Builder

	data.Custom(&builder, name, prefix, "", data)

	androidMk := builder.String()

	ensureContains(t, androidMk, "LOCAL_VINTF_FRAGMENTS := fragment.xml\n")

	ensureContains(t, androidMk, "LOCAL_INIT_RC := init.rc\n")

}



func TestStaticLinking(t *testing.T) {

	ctx, _ := testApex(t, `

		apex {