Merge "Don't add flattened files apex as dependencies of an image apex" (926d00c2) · Commits · e / os / android_build_soong

apex/androidmk.go

+6 −6

Original line number	Diff line number	Diff line
		@@ -339,14 +339,14 @@ func (a *apexBundle) writeRequiredModules(w io.Writer, moduleNames []string) {
		func (a *apexBundle) androidMkForType() android.AndroidMkData {
		return android.AndroidMkData{
		Custom: func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
		moduleNames := []string{}
		apexType := a.properties.ApexType

		if apexType == flattenedApex {
		var moduleNames []string = nil
		if a.installable() {
		apexName := proptools.StringDefault(a.properties.Apex_name, name)
		moduleNames = a.androidMkForFiles(w, name, apexName, moduleDir, data)
		}

		if apexType == flattenedApex {
		// Only image APEXes can be flattened.
		fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
		fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
		@@ -390,7 +390,7 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData {
		if len(a.overridableProperties.Overrides) > 0 {
		fmt.Fprintln(w, "LOCAL_OVERRIDES_MODULES :=", strings.Join(a.overridableProperties.Overrides, " "))
		}
		a.writeRequiredModules(w, moduleNames)
		a.writeRequiredModules(w, nil)

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

apex/apex_test.go

+3 −17

Original line number	Diff line number	Diff line
		@@ -527,7 +527,6 @@ func TestBasicApex(t *testing.T) {
		data.Custom(&builder, ab.BaseModuleName(), "TARGET_", "", data)

		androidMk := builder.String()
		ensureContains(t, androidMk, "LOCAL_MODULE := mylib.myapex\n")
		ensureNotContains(t, androidMk, "LOCAL_MODULE := mylib.com.android.myapex\n")

		optFlags := apexRule.Args["opt_flags"]
		@@ -4126,7 +4125,6 @@ func TestApexName(t *testing.T) {
		var builder strings.Builder
		data.Custom(&builder, name, prefix, "", data)
		androidMk := builder.String()
		ensureContains(t, androidMk, "LOCAL_MODULE := mylib.myapex\n")
		ensureNotContains(t, androidMk, "LOCAL_MODULE := mylib.com.android.myapex\n")
		}

		@@ -5625,12 +5623,6 @@ func TestApexWithTests(t *testing.T) {
		var builder strings.Builder
		data.Custom(&builder, name, prefix, "", data)
		androidMk := builder.String()
		ensureContains(t, androidMk, "LOCAL_MODULE := mytest.myapex\n")
		ensureContains(t, androidMk, "LOCAL_MODULE := mytest1.myapex\n")
		ensureContains(t, androidMk, "LOCAL_MODULE := mytest2.myapex\n")
		ensureContains(t, androidMk, "LOCAL_MODULE := mytest3.myapex\n")
		ensureContains(t, androidMk, "LOCAL_MODULE := apex_manifest.pb.myapex\n")
		ensureContains(t, androidMk, "LOCAL_MODULE := apex_pubkey.myapex\n")
		ensureContains(t, androidMk, "LOCAL_MODULE := myapex\n")

		flatBundle := ctx.ModuleForTests("myapex", "android_common_myapex_flattened").Module().(*apexBundle)
		@@ -6457,12 +6449,6 @@ func TestOverrideApex(t *testing.T) {
		var builder strings.Builder
		data.Custom(&builder, name, "TARGET_", "", data)
		androidMk := builder.String()
		ensureContains(t, androidMk, "LOCAL_MODULE := override_app.override_myapex")
		ensureContains(t, androidMk, "LOCAL_MODULE := overrideBpf.o.override_myapex")
		ensureContains(t, androidMk, "LOCAL_MODULE := apex_manifest.pb.override_myapex")
		ensureContains(t, androidMk, "LOCAL_MODULE := override_bcplib.override_myapex")
		ensureContains(t, androidMk, "LOCAL_MODULE := override_systemserverlib.override_myapex")
		ensureContains(t, androidMk, "LOCAL_MODULE := override_java_library.override_myapex")
		ensureContains(t, androidMk, "LOCAL_MODULE_STEM := override_myapex.apex")
		ensureContains(t, androidMk, "LOCAL_OVERRIDES_MODULES := unknownapex myapex")
		ensureNotContains(t, androidMk, "LOCAL_MODULE := app.myapex")
		@@ -7192,17 +7178,17 @@ func TestSymlinksFromApexToSystemRequiredModuleNames(t *testing.T) {
		}
		`)

		apexBundle := ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().(*apexBundle)
		apexBundle := ctx.ModuleForTests("myapex", "android_common_myapex_flattened").Module().(*apexBundle)
		data := android.AndroidMkDataForTest(t, ctx, apexBundle)
		var builder strings.Builder
		data.Custom(&builder, apexBundle.BaseModuleName(), "TARGET_", "", data)
		androidMk := builder.String()
		// `myotherlib` is added to `myapex` as symlink
		ensureContains(t, androidMk, "LOCAL_MODULE := mylib.myapex\n")
		ensureContains(t, androidMk, "LOCAL_MODULE := mylib.myapex.flattened\n")
		ensureNotContains(t, androidMk, "LOCAL_MODULE := prebuilt_myotherlib.myapex\n")
		ensureNotContains(t, androidMk, "LOCAL_MODULE := myotherlib.myapex\n")
		// `myapex` should have `myotherlib` in its required line, not `prebuilt_myotherlib`
		ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES += mylib.myapex:64 myotherlib:64 apex_manifest.pb.myapex apex_pubkey.myapex\n")
		ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES += mylib.myapex.flattened:64 myotherlib:64 apex_manifest.pb.myapex.flattened apex_pubkey.myapex.flattened\n")
		}

		func TestApexWithJniLibs(t *testing.T) {