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

Browse Source 
The build actions will be generated by the top-level apex.

Test: go test ./apex
Test: lunch cf_x86_64_phone-next-userdebug (uses mainline prebuilts)
Test: verified no diff in file_list.txt
Bug: 368337090
Change-Id: I170cf4beec18b54cd950560ea0991bc6f1455d76
This commit is contained in:
Spandan Das
2024-09-21 02:50:00 +00:00
parent e350e36e7b
commit 9d6e209f44
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

@@ -7862,9 +7862,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())
@@ -7889,10 +7889,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())
@@ -8454,7 +8454,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")
@@ -8495,7 +8495,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")