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

Remove the internal extractor module created by apex_set am: 9d6e209f44 am: 5994600572

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

Change-Id: Iac682fe1a9026f4075929adfd895913f1c3c567d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das
2024-09-23 23:13:07 +00:00
committed by Automerger Merge Worker
parent bfa06e3d07 5994600572
commit 1b0fddb015
2 changed files with 36 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apex/apex_test.go
View File

@@ -7861,9 +7861,9 @@ func TestAppSetBundlePrebuilt(t *testing.T) {
ctx := testApex(t, bp, prepareForTestWithSantitizeHwaddress)
// Check that the extractor produces the correct output file from the correct input file.
extractorOutput := "out/soong/.intermediates/prebuilt_myapex.apex.extractor/android_common/extracted/myapex.hwasan.apks"
extractorOutput := "out/soong/.intermediates/myapex/android_common_myapex/extracted/myapex.hwasan.apks"
m := ctx.ModuleForTests("prebuilt_myapex.apex.extractor", "android_common")
m := ctx.ModuleForTests("myapex", "android_common_myapex")
extractedApex := m.Output(extractorOutput)
android.AssertArrayString(t, "extractor input", []string{"myapex.hwasan.apks"}, extractedApex.Inputs.Strings())
@@ -7888,10 +7888,10 @@ func TestApexSetApksModuleAssignment(t *testing.T) {
}
`)
m := ctx.ModuleForTests("prebuilt_myapex.apex.extractor", "android_common")
m := ctx.ModuleForTests("myapex", "android_common_myapex")
// Check that the extractor produces the correct apks file from the input module
extractorOutput := "out/soong/.intermediates/prebuilt_myapex.apex.extractor/android_common/extracted/myapex.apks"
extractorOutput := "out/soong/.intermediates/myapex/android_common_myapex/extracted/myapex.apks"
extractedApex := m.Output(extractorOutput)
android.AssertArrayString(t, "extractor input", []string{"myapex.apks"}, extractedApex.Inputs.Strings())
@@ -8453,7 +8453,7 @@ func TestApexSet(t *testing.T) {
}),
)
m := ctx.ModuleForTests("prebuilt_myapex.apex.extractor", "android_common")
m := ctx.ModuleForTests("myapex", "android_common_myapex")
// Check extract_apks tool parameters.
extractedApex := m.Output("extracted/myapex.apks")
@@ -8494,7 +8494,7 @@ func TestApexSet_NativeBridge(t *testing.T) {
}),
)
m := ctx.ModuleForTests("prebuilt_myapex.apex.extractor", "android_common")
m := ctx.ModuleForTests("myapex", "android_common_myapex")
// Check extract_apks tool parameters. No native bridge arch expected
extractedApex := m.Output("extracted/myapex.apks")