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

Commit cada807a authored by Liz Kammer's avatar Liz Kammer
Browse files

Update language to comply with inclusive guidance 

Update android_app_set to use word install rather than master for
android_app_sets, this better matches the phrasing used for apex_set.

See https://source.android.com/setup/contribute/respectful-code for
reference

Bug: 161896447
Test: m nothing
Change-Id: I429e7f8b16c42c10ad4d9543110f5ce814a893b1
parent 8ffde8c9

apex/androidmk.go

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
			if !ok {

				panic(fmt.Sprintf("Expected %s to be AndroidAppSet", fi.module))

			}

			fmt.Fprintln(w, "LOCAL_APK_SET_MASTER_FILE :=", as.MasterFile())

			fmt.Fprintln(w, "LOCAL_APK_SET_INSTALL_FILE :=", as.InstallFile())

			fmt.Fprintln(w, "LOCAL_APKCERTS_FILE :=", as.APKCertsFile().String())

			fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_android_app_set.mk")

		case nativeSharedLib, nativeExecutable, nativeTest:

java/androidmk.go

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ func (apkSet *AndroidAppSet) AndroidMkEntries() []android.AndroidMkEntries { 
			ExtraEntries: []android.AndroidMkExtraEntriesFunc{

				func(entries *android.AndroidMkEntries) {

					entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", apkSet.Privileged())

					entries.SetString("LOCAL_APK_SET_MASTER_FILE", apkSet.masterFile)

					entries.SetString("LOCAL_APK_SET_INSTALL_FILE", apkSet.InstallFile())

					entries.SetPath("LOCAL_APKCERTS_FILE", apkSet.apkcertsFile)

					entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", apkSet.properties.Overrides...)

				},

java/app.go

+6 −6
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ type AndroidAppSet struct { 


	properties   AndroidAppSetProperties

	packedOutput android.WritablePath

	masterFile   string

	installFile  string

	apkcertsFile android.ModuleOutPath

}
@@ -102,8 +102,8 @@ func (as *AndroidAppSet) OutputFile() android.Path { 
	return as.packedOutput

}



func (as *AndroidAppSet) MasterFile() string {

	return as.masterFile

func (as *AndroidAppSet) InstallFile() string {

	return as.installFile

}



func (as *AndroidAppSet) APKCertsFile() android.Path {
@@ -136,10 +136,10 @@ func SupportedAbis(ctx android.ModuleContext) []string { 
func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	as.packedOutput = android.PathForModuleOut(ctx, ctx.ModuleName()+".zip")

	as.apkcertsFile = android.PathForModuleOut(ctx, "apkcerts.txt")

	// We are assuming here that the master file in the APK

	// We are assuming here that the install file in the APK

	// set has `.apk` suffix. If it doesn't the build will fail.

	// APK sets containing APEX files are handled elsewhere.

	as.masterFile = as.BaseModuleName() + ".apk"

	as.installFile = as.BaseModuleName() + ".apk"

	screenDensities := "all"

	if dpis := ctx.Config().ProductAAPTPrebuiltDPI(); len(dpis) > 0 {

		screenDensities = strings.ToUpper(strings.Join(dpis, ","))
@@ -167,7 +167,7 @@ func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) 


// android_app_set extracts a set of APKs based on the target device

// configuration and installs this set as "split APKs".

// The extracted set always contains 'master' APK whose name is

// The extracted set always contains an APK whose name is

// _module_name_.apk and every split APK matching target device.

// The extraction of the density-specific splits depends on

// PRODUCT_AAPT_PREBUILT_DPI variable. If present (its value should

java/app_test.go

+5 −5
Original line number Diff line number Diff line
@@ -161,11 +161,11 @@ func TestAndroidAppSet(t *testing.T) { 
		t.Errorf("wrong partition value: '%s', expected 'system'", s)

	}

	mkEntries := android.AndroidMkEntriesForTest(t, config, "", module.Module())[0]

	actualMaster := mkEntries.EntryMap["LOCAL_APK_SET_MASTER_FILE"]

	expectedMaster := []string{"foo.apk"}

	if !reflect.DeepEqual(actualMaster, expectedMaster) {

		t.Errorf("Unexpected LOCAL_APK_SET_MASTER_FILE value: '%s', expected: '%s',",

			actualMaster, expectedMaster)

	actualInstallFile := mkEntries.EntryMap["LOCAL_APK_SET_INSTALL_FILE"]

	expectedInstallFile := []string{"foo.apk"}

	if !reflect.DeepEqual(actualInstallFile, expectedInstallFile) {

		t.Errorf("Unexpected LOCAL_APK_SET_INSTALL_FILE value: '%s', expected: '%s',",

			actualInstallFile, expectedInstallFile)

	}

}