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

Commit cacc4f35 authored by Jiyong Park's avatar Jiyong Park
Browse files

Respect `required` property of apex modules 

This CL fixes a bug that `required` property of apex modules is not
reflected to the generated Android.mk file.

Bug: N/A
Test: m nothing
Change-Id: I36ccf538882f083f9433bd3eb05b3a5127f3822b
parent 2a524318

apex/androidmk.go

+3 −0
Original line number Diff line number Diff line
@@ -326,6 +326,9 @@ func (a *apexBundle) writeRequiredModules(w io.Writer, apexBundleName string) { 
	var required []string

	var targetRequired []string

	var hostRequired []string

	required = append(required, a.RequiredModuleNames()...)

	targetRequired = append(targetRequired, a.TargetRequiredModuleNames()...)

	hostRequired = append(hostRequired, a.HostRequiredModuleNames()...)

	installMapSet := make(map[string]bool) // set of dependency module:location mappings

	for _, fi := range a.filesInfo {

		required = append(required, fi.requiredModuleNames...)

apex/apex_test.go

+40 −0
Original line number Diff line number Diff line
@@ -8328,6 +8328,46 @@ func TestAndroidMk_DexpreoptBuiltInstalledForApex_Prebuilt(t *testing.T) { 
		})

}



func TestAndroidMk_RequiredModules(t *testing.T) {

	ctx := testApex(t, `

		apex {

			name: "myapex",

			key: "myapex.key",

			updatable: false,

			java_libs: ["foo"],

			required: ["otherapex"],

		}



		apex {

			name: "otherapex",

			key: "myapex.key",

			updatable: false,

			java_libs: ["foo"],

			required: ["otherapex"],

		}



		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}



		java_library {

			name: "foo",

			srcs: ["foo.java"],

			apex_available: ["myapex", "otherapex"],

			installable: true,

		}

	`)



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

	data := android.AndroidMkDataForTest(t, ctx, apexBundle)

	var builder strings.Builder

	data.Custom(&builder, apexBundle.BaseModuleName(), "TARGET_", "", data)

	androidMk := builder.String()

	ensureContains(t, androidMk, "LOCAL_REQUIRED_MODULES += otherapex")

}



func TestMain(m *testing.M) {

	os.Exit(m.Run())

}