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

Commit d7d179a0 authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge changes from topic "multi_install_skip_symbol_files" 

* changes:
  Remove apex.multi_install_skip_symbol_files
  VNDK APEX doesn't use "apex_name" property
parents 667200e2 88b057ef

apex/androidmk.go

+1 −15
Original line number Diff line number Diff line
@@ -95,20 +95,6 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
		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

	}



	// Avoid creating duplicate build rules for multi-installed APEXes.

	if proptools.BoolDefault(a.properties.Multi_install_skip_symbol_files, false) {

		return moduleNames

	}



	seenDataOutPaths := make(map[string]bool)



	for _, fi := range a.filesInfo {
@@ -152,7 +138,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
			// /system/apex/<name>/{lib|framework|...}

			modulePath = filepath.Join(a.installDir.String(), apexBundleName, fi.installDir)

			fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", modulePath)

			if a.primaryApexType && !symbolFilesNotNeeded {

			if a.primaryApexType {

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

			}

			android.AndroidMkEmitAssignList(w, "LOCAL_MODULE_SYMLINKS", fi.symlinks)

apex/apex.go

+0 −10
Original line number Diff line number Diff line
@@ -149,16 +149,6 @@ type apexBundleProperties struct { 
	// Should be only used in non-system apexes (e.g. vendor: true). Default is false.

	Use_vndk_as_stable *bool



	// Whether this is multi-installed APEX should skip installing symbol files.

	// Multi-installed APEXes share the same apex_name and are installed at the same time.

	// Default is false.

	//

	// Should be set to true for all multi-installed APEXes except the singular

	// default version within the multi-installed group.

	// Only the default version can install symbol files in $(PRODUCT_OUT}/apex,

	// or else conflicting build rules may be created.

	Multi_install_skip_symbol_files *bool



	// The type of APEX to build. Controls what the APEX payload is. Either 'image', 'zip' or

	// 'both'. When set to image, contents are stored in a filesystem image inside a zip

	// container. When set to zip, contents are stored in a zip container directly. This type is

apex/apex_test.go

+3 −8
Original line number Diff line number Diff line
@@ -3806,11 +3806,9 @@ func TestVndkApexNameRule(t *testing.T) { 
		}`+vndkLibrariesTxtFiles("28", "current"))



	assertApexName := func(expected, moduleName string) {

		bundle := ctx.ModuleForTests(moduleName, "android_common_image").Module().(*apexBundle)

		actual := proptools.String(bundle.properties.Apex_name)

		if !reflect.DeepEqual(actual, expected) {

			t.Errorf("Got '%v', expected '%v'", actual, expected)

		}

		module := ctx.ModuleForTests(moduleName, "android_common_image")

		apexManifestRule := module.Rule("apexManifestRule")

		ensureContains(t, apexManifestRule.Args["opt"], "-v name "+expected)

	}



	assertApexName("com.android.vndk.v29", "com.android.vndk.current")
@@ -4136,9 +4134,6 @@ func TestApexName(t *testing.T) { 
	`)



	module := ctx.ModuleForTests("myapex", "android_common_com.android.myapex_image")

	apexManifestRule := module.Rule("apexManifestRule")

	ensureContains(t, apexManifestRule.Args["opt"], "-v name com.android.myapex")



	apexBundle := module.Module().(*apexBundle)

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

	name := apexBundle.BaseModuleName()

apex/builder.go

+5 −17
Original line number Diff line number Diff line
@@ -241,10 +241,11 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, 
	provideNativeLibs = android.SortedUniqueStrings(provideNativeLibs)

	requireNativeLibs = android.SortedUniqueStrings(android.RemoveListFromList(requireNativeLibs, provideNativeLibs))



	// APEX name can be overridden

	// VNDK APEX name is determined at runtime, so update "name" in apex_manifest

	optCommands := []string{}

	if a.properties.Apex_name != nil {

		optCommands = append(optCommands, "-v name "+*a.properties.Apex_name)

	if a.vndkApex {

		apexName := vndkApexNamePrefix + a.vndkVersion(ctx.DeviceConfig())

		optCommands = append(optCommands, "-v name "+apexName)

	}



	// Collect jniLibs. Notice that a.filesInfo is already sorted
@@ -454,19 +455,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 


	installSymbolFiles := (!ctx.Config().KatiEnabled() || a.ExportedToMake()) && a.installable()



	// 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.

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

		installSymbolFiles = false

	}



	// Avoid creating duplicate build rules for multi-installed APEXes.

	if proptools.BoolDefault(a.properties.Multi_install_skip_symbol_files, false) {

		installSymbolFiles = false



	}

	// set of dependency module:location mappings

	installMapSet := make(map[string]bool)
@@ -1012,7 +1000,7 @@ func (a *apexBundle) getOverrideManifestPackageName(ctx android.ModuleContext) s 
	if a.vndkApex {

		overrideName, overridden := ctx.DeviceConfig().OverrideManifestPackageNameFor(vndkApexName)

		if overridden {

			return strings.Replace(*a.properties.Apex_name, vndkApexName, overrideName, 1)

			return overrideName + ".v" + a.vndkVersion(ctx.DeviceConfig())

		}

		return ""

	}

apex/vndk.go

+0 −4
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ func apexVndkMutator(mctx android.TopDownMutatorContext) { 
		}



		vndkVersion := ab.vndkVersion(mctx.DeviceConfig())



		// Ensure VNDK APEX mount point is formatted as com.android.vndk.v###

		ab.properties.Apex_name = proptools.StringPtr(vndkApexNamePrefix + vndkVersion)



		apiLevel, err := android.ApiLevelFromUser(mctx, vndkVersion)

		if err != nil {

			mctx.PropertyErrorf("vndk_version", "%s", err.Error())