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

Build updatable-bcp-packages.txt from prebuilts in sdk snapshot

Browse Source 
Previously, the java_import and java_sdk_library_import modules did not
make their permitted_packages available to the rule that generates the
updatable-bcp-packages.txt file. This change corrects that.

Bug: 193095050
Test: m nothing
      - Added unit tests, which all failed and then fixed the tests.
Merged-In: If0706e4551a331b48d383123088e63924dded48b
Change-Id: If0706e4551a331b48d383123088e63924dded48b
(cherry picked from commit 630b11e9d4)
This commit is contained in:
Paul Duffin
2021-07-15 13:35:26 +01:00
parent 7b3e10a1c2
commit dbcc29647a
4 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/bootclasspath_fragment_sdk_test.go
View File

@@ -532,6 +532,12 @@ sdk_snapshot {
out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/index-from-classes.csv
snapshot/hiddenapi/index.csv
`, rule)
// Make sure that the permitted packages from the prebuilts end up in the
// updatable-bcp-packages.txt file.
rule = module.Output("updatable-bcp-packages.txt")
expectedContents := `'mybootlib\nmyothersdklibrary\n'`
android.AssertStringEquals(t, "updatable-bcp-packages.txt", expectedContents, rule.Args["content"])
}),
snapshotTestPreparer(checkSnapshotWithSourcePreferred, preparerForSnapshot),
snapshotTestPreparer(checkSnapshotPreferredWithSource, preparerForSnapshot),