StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with inclusive guidance"

Browse Source
This commit is contained in:
Treehugger Robot
2020-07-31 22:50:49 +00:00
committed by Gerrit Code Review
parent bbec4c4325 cada807a92
commit cf04073b43
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/androidmk.go
View File

@@ -214,7 +214,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
if !ok { if !ok {
panic(fmt.Sprintf("Expected %s to be AndroidAppSet", fi.module)) 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, "LOCAL_APKCERTS_FILE :=", as.APKCertsFile().String())
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_android_app_set.mk") fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_android_app_set.mk")
case nativeSharedLib, nativeExecutable, nativeTest: case nativeSharedLib, nativeExecutable, nativeTest:

2
java/androidmk.go
View File

@@ -728,7 +728,7 @@ func (apkSet *AndroidAppSet) AndroidMkEntries() []android.AndroidMkEntries {
ExtraEntries: []android.AndroidMkExtraEntriesFunc{ ExtraEntries: []android.AndroidMkExtraEntriesFunc{
func(entries *android.AndroidMkEntries) { func(entries *android.AndroidMkEntries) {
entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", apkSet.Privileged()) 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.SetPath("LOCAL_APKCERTS_FILE", apkSet.apkcertsFile)
entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", apkSet.properties.Overrides...) entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", apkSet.properties.Overrides...)
}, },

12
java/app.go
View File

@@ -78,7 +78,7 @@ type AndroidAppSet struct {
properties AndroidAppSetProperties properties AndroidAppSetProperties
packedOutput android.WritablePath packedOutput android.WritablePath
masterFile string installFile string
apkcertsFile android.ModuleOutPath apkcertsFile android.ModuleOutPath
} }
@@ -102,8 +102,8 @@ func (as *AndroidAppSet) OutputFile() android.Path {
return as.packedOutput return as.packedOutput
} }
func (as *AndroidAppSet) MasterFile() string { func (as *AndroidAppSet) InstallFile() string {
return as.masterFile return as.installFile
} }
func (as *AndroidAppSet) APKCertsFile() android.Path { func (as *AndroidAppSet) APKCertsFile() android.Path {
@@ -136,10 +136,10 @@ func SupportedAbis(ctx android.ModuleContext) []string {
func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {
as.packedOutput = android.PathForModuleOut(ctx, ctx.ModuleName()+".zip") as.packedOutput = android.PathForModuleOut(ctx, ctx.ModuleName()+".zip")
as.apkcertsFile = android.PathForModuleOut(ctx, "apkcerts.txt") 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. // set has `.apk` suffix. If it doesn't the build will fail.
// APK sets containing APEX files are handled elsewhere. // APK sets containing APEX files are handled elsewhere.
as.masterFile = as.BaseModuleName() + ".apk" as.installFile = as.BaseModuleName() + ".apk"
screenDensities := "all" screenDensities := "all"
if dpis := ctx.Config().ProductAAPTPrebuiltDPI(); len(dpis) > 0 { if dpis := ctx.Config().ProductAAPTPrebuiltDPI(); len(dpis) > 0 {
screenDensities = strings.ToUpper(strings.Join(dpis, ",")) 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 // android_app_set extracts a set of APKs based on the target device
// configuration and installs this set as "split APKs". // 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. // _module_name_.apk and every split APK matching target device.
// The extraction of the density-specific splits depends on // The extraction of the density-specific splits depends on
// PRODUCT_AAPT_PREBUILT_DPI variable. If present (its value should // PRODUCT_AAPT_PREBUILT_DPI variable. If present (its value should

10
java/app_test.go
View File

@@ -161,11 +161,11 @@ func TestAndroidAppSet(t *testing.T) {
t.Errorf("wrong partition value: '%s', expected 'system'", s) t.Errorf("wrong partition value: '%s', expected 'system'", s)
} }
mkEntries := android.AndroidMkEntriesForTest(t, config, "", module.Module())[0] mkEntries := android.AndroidMkEntriesForTest(t, config, "", module.Module())[0]
actualMaster := mkEntries.EntryMap["LOCAL_APK_SET_MASTER_FILE"] actualInstallFile := mkEntries.EntryMap["LOCAL_APK_SET_INSTALL_FILE"]
expectedMaster := []string{"foo.apk"} expectedInstallFile := []string{"foo.apk"}
if !reflect.DeepEqual(actualMaster, expectedMaster) { if !reflect.DeepEqual(actualInstallFile, expectedInstallFile) {
t.Errorf("Unexpected LOCAL_APK_SET_MASTER_FILE value: '%s', expected: '%s',", t.Errorf("Unexpected LOCAL_APK_SET_INSTALL_FILE value: '%s', expected: '%s',",
actualMaster, expectedMaster) actualInstallFile, expectedInstallFile)
} }
} }