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

Merge changes from topic "uses-libs-5" am: 8fab5bcce3 am: a4cdcd3796

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

Change-Id: I182197011a993ebc47312131327faefe9d4b17c3
This commit is contained in:
Ulyana Trafimovich
2020-07-02 09:32:32 +00:00
committed by Automerger Merge Worker
parent 9462819908 a4cdcd3796
commit 21b5ffa966
9 changed files with 259 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/app_test.go
View File

@@ -2652,13 +2652,13 @@ func TestUsesLibraries(t *testing.T) {
// Test that only present libraries are preopted
cmd = app.Rule("dexpreopt").RuleParams.Command
if w := `dex_preopt_target_libraries="/system/framework/foo.jar /system/framework/bar.jar"`; !strings.Contains(cmd, w) {
if w := `--target-classpath-for-sdk any /system/framework/foo.jar:/system/framework/bar.jar`; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
}
cmd = prebuilt.Rule("dexpreopt").RuleParams.Command
if w := `dex_preopt_target_libraries="/system/framework/foo.jar /system/framework/bar.jar"`; !strings.Contains(cmd, w) {
if w := `--target-classpath-for-sdk any /system/framework/foo.jar:/system/framework/bar.jar`; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
}
}