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

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

Use module name as the suffix for apex variant 

apex {
    name: "myapex",
    native_shared_libs: ["libfoo"],
    apex_name: "apex_name",
}

override_apex {
    name: "myapex.override",
    base: "myapex"
}

Previsouly, above wasn't supported because both APEXes have the same
apex_name and that apex_name is used as the suffix of libfoo. i.e.,
there are two libfoo.apex_name modules defined.

Now, the two apex variants of libfoo are named as
libfoo.myapex and libfoo.myapex.override.

Bug: 140136207
Test: m
Change-Id: I63f8a1de463011c6e0b97f5f6eee83103e22bc30
parent 26a6eb79

apex/androidmk.go

+19 −6
Original line number Diff line number Diff line
@@ -42,7 +42,11 @@ func (a *apexBundle) AndroidMk() android.AndroidMkData { 
		}}

}



func (a *apexBundle) androidMkForFiles(w io.Writer, apexName, moduleDir string) []string {

func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, moduleDir string) []string {

	// apexBundleName comes from the 'name' property; apexName comes from 'apex_name' property.

	// An apex is installed to /system/apex/<apexBundleName> and is activated at /apex/<apexName>

	// In many cases, the two names are the same, but could be different in general.



	moduleNames := []string{}

	apexType := a.properties.ApexType

	// To avoid creating duplicate build rules, run this function only when primaryApexType is true
@@ -52,12 +56,21 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexName, moduleDir string) 
		return moduleNames

	}



	// b/140136207. When there are overriding APEXes for a VNDK APEX, the symbols file for the overridden

	// APEX and the overriding APEX will have the same installation paths at /apex/com.android.vndk.v<ver>

	// as their apexName will be the same. To avoid the path conflicts, skip installing the symbol files

	// for the overriding VNDK APEXes.

	symbolFilesNotNeeded := a.vndkApex && len(a.overridableProperties.Overrides) > 0

	if symbolFilesNotNeeded && apexType != flattenedApex {

		return moduleNames

	}



	var postInstallCommands []string

	for _, fi := range a.filesInfo {

		if a.linkToSystemLib && fi.transitiveDep && fi.AvailableToPlatform() {

			// TODO(jiyong): pathOnDevice should come from fi.module, not being calculated here

			linkTarget := filepath.Join("/system", fi.Path())

			linkPath := filepath.Join(a.installDir.ToMakePath().String(), apexName, fi.Path())

			linkPath := filepath.Join(a.installDir.ToMakePath().String(), apexBundleName, fi.Path())

			mkdirCmd := "mkdir -p " + filepath.Dir(linkPath)

			linkCmd := "ln -sfn " + linkTarget + " " + linkPath

			postInstallCommands = append(postInstallCommands, mkdirCmd, linkCmd)
@@ -75,7 +88,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexName, moduleDir string) 
		if linkToSystemLib {

			moduleName = fi.moduleName

		} else {

			moduleName = fi.moduleName + "." + apexName + a.suffix

			moduleName = fi.moduleName + "." + apexBundleName + a.suffix

		}



		if !android.InList(moduleName, moduleNames) {
@@ -99,8 +112,8 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexName, moduleDir string) 
		if apexType == flattenedApex {

			// /system/apex/<name>/{lib|framework|...}

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

				apexName, fi.installDir))

			if a.primaryApexType {

				apexBundleName, fi.installDir))

			if a.primaryApexType && !symbolFilesNotNeeded {

				fmt.Fprintln(w, "LOCAL_SOONG_SYMBOL_PATH :=", pathWhenActivated)

			}

			if len(fi.symlinks) > 0 {
@@ -236,7 +249,7 @@ func (a *apexBundle) androidMkForType() android.AndroidMkData { 
			apexType := a.properties.ApexType

			if a.installable() {

				apexName := proptools.StringDefault(a.properties.Apex_name, name)

				moduleNames = a.androidMkForFiles(w, apexName, moduleDir)

				moduleNames = a.androidMkForFiles(w, name, apexName, moduleDir)

			}



			if apexType == flattenedApex {

apex/apex_test.go

+23 −1
Original line number Diff line number Diff line
@@ -2209,11 +2209,12 @@ func TestDependenciesInApexManifest(t *testing.T) { 
}



func TestApexName(t *testing.T) {

	ctx, _ := testApex(t, `

	ctx, config := testApex(t, `

		apex {

			name: "myapex",

			key: "myapex.key",

			apex_name: "com.android.myapex",

			native_shared_libs: ["mylib"],

		}



		apex_key {
@@ -2221,6 +2222,17 @@ func TestApexName(t *testing.T) { 
			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}



		cc_library {

			name: "mylib",

			srcs: ["mylib.cpp"],

			system_shared_libs: [],

			stl: "none",

			apex_available: [

				"//apex_available:platform",

				"myapex",

			],

		}

	`)



	module := ctx.ModuleForTests("myapex", "android_common_myapex_image")
@@ -2228,6 +2240,16 @@ func TestApexName(t *testing.T) { 
	ensureContains(t, apexManifestRule.Args["opt"], "-v name com.android.myapex")

	apexRule := module.Rule("apexRule")

	ensureContains(t, apexRule.Args["opt_flags"], "--do_not_check_keyname")



	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_MODULE := mylib.myapex\n")

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

}



func TestNonTestApex(t *testing.T) {