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

Merge "Fix handling of "android.test.mock" in class loader context." am: 17da06cfd9 am: 94b74f9559

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

Change-Id: I97846bd84c82943c7df2c0a74eca2431013fd16b
This commit is contained in:
Ulyana Trafimovich
2020-10-29 11:17:44 +00:00
committed by Automerger Merge Worker
parent 2e1a40491f 94b74f9559
commit deea2844fd
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dexpreopt/dexpreopt.go
View File

@@ -312,8 +312,7 @@ func genClassLoaderContext(ctx android.PathContext, global *GlobalConfig, module
}
// Conditional class loader context for API version < 30.
const testBase = "android.test.base"
if !classLoaderContexts.addLibs(ctx, 30, module, testBase) {
if !classLoaderContexts.addLibs(ctx, 30, module, OptionalCompatUsesLibs30...) {
return nil
}
@@ -343,6 +342,9 @@ func fixConditionalClassLoaderContext(clcMap classLoaderContextMap) {
for i, lib := range clc.Names {
if android.InList(lib, usesLibs) {
// skip compatibility libraries that are already included in unconditional context
} else if lib == AndroidTestMock && !android.InList("android.test.runner", usesLibs) {
// android.test.mock is only needed as a compatibility library (in conditional class
// loader context) if android.test.runner is used, otherwise skip it
} else {
clcMap[sdkVer].addLib(lib, clc.Host[i], clc.Target[i])
}

5
java/app_test.go
View File

@@ -2838,6 +2838,7 @@ func TestUsesLibraries(t *testing.T) {
}
// Test conditional context for target SDK version 30.
// "android.test.mock" is absent because "android.test.runner" is not used.
if w := `--target-classpath-for-sdk 30` +
` /system/framework/android.test.base.jar `; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
@@ -2852,8 +2853,10 @@ func TestUsesLibraries(t *testing.T) {
}
// Test conditional context for target SDK version 30.
// "android.test.mock" is present because "android.test.runner" is used.
if w := `--target-classpath-for-sdk 30` +
` /system/framework/android.test.base.jar `; !strings.Contains(cmd, w) {
` /system/framework/android.test.base.jar` +
`:/system/framework/android.test.mock.jar `; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
}
}