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" am: cf04073b43 am: abeb7c4538

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1374706

Change-Id: Ie032c705309843d27f26699818fa6a8065808a99
This commit is contained in:
Treehugger Robot
2020-07-31 23:35:03 +00:00
committed by Automerger Merge Worker
parent f077b29477 abeb7c4538
commit c03dc74149
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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)
}
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)
}
}