Skip to content

Commit 048930f

Browse files
jihoonkang0829jihoonkang0829
committed
Make java_sdk_library dependencies explicit
modules should specify the submodule of java_sdk_library that the module actually depends on Test: CI Ignore-AOSP-First: resolving merge conflicts Flag: EXEMPT build dependency cleanup Bug: 358613520 Change-Id: I80af0b9efa88c668306f0ff1d51491a8180dc57f
1 parent 4440763 commit 048930f

File tree

125 files changed

+312
-298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+312
-298
lines changed

‎apct-tests/perftests/core/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ android_test {
5252
"guava",
5353
],
5454

55-
libs: ["android.test.base"],
55+
libs: ["android.test.base.stubs.system"],
5656

5757
java_resources: [":GoogleFontDancingScript"],
5858

‎apct-tests/perftests/healthconnect/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android_test {
3737
"collector-device-lib-platform",
3838
],
3939

40-
libs: ["android.test.base"],
40+
libs: ["android.test.base.stubs.system"],
4141
platform_apis: true,
4242
test_suites: ["device-tests"],
4343
data: [":perfetto_artifacts"],

‎apct-tests/perftests/packagemanager/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android_test {
2828
"services.core",
2929
],
3030

31-
libs: ["android.test.base"],
31+
libs: ["android.test.base.stubs.system"],
3232

3333
platform_apis: true,
3434

‎apct-tests/perftests/permission/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android_test {
4343
"cts-install-lib-java",
4444
],
4545

46-
libs: ["android.test.base"],
46+
libs: ["android.test.base.stubs.system"],
4747

4848
platform_apis: true,
4949

‎apct-tests/perftests/settingsprovider/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android_test {
2828
"services.core",
2929
],
3030

31-
libs: ["android.test.base"],
31+
libs: ["android.test.base.stubs.system"],
3232

3333
platform_apis: true,
3434

‎cmds/uiautomator/library/Android.bp

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ java_library_static {
7171
":uiautomator-stubs",
7272
],
7373
libs: [
74-
"android.test.runner",
74+
"android.test.runner.stubs.system",
7575
"junit",
7676
],
7777
java_version: "1.8",
@@ -84,8 +84,8 @@ java_library_static {
8484
"testrunner-src/**/*.java",
8585
],
8686
libs: [
87-
"android.test.runner",
88-
"android.test.base",
87+
"android.test.runner.stubs.system",
88+
"android.test.base.stubs.system",
8989
],
9090
static_libs: [
9191
"junit",

‎core/tests/BroadcastRadioTests/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android_test {
4545
"flag-junit",
4646
"mockito-target-extended",
4747
],
48-
libs: ["android.test.base"],
48+
libs: ["android.test.base.stubs.system"],
4949
test_suites: [
5050
"general-tests",
5151
"automotive-general-tests",

‎core/tests/ConnectivityManagerTest/Android.bp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ package {
2424
android_test {
2525
name: "ConnectivityManagerTest",
2626
libs: [
27-
"android.test.runner",
28-
"android.test.base",
27+
"android.test.runner.stubs.system",
28+
"android.test.base.stubs.system",
2929
],
3030
static_libs: [
3131
"junit",

‎core/tests/GameManagerTests/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android_test {
3232
"platform-test-annotations",
3333
"truth",
3434
],
35-
libs: ["android.test.runner"],
35+
libs: ["android.test.runner.stubs.system"],
3636
platform_apis: true,
3737
certificate: "platform",
3838
test_suites: ["device-tests"],

‎core/tests/InputMethodCoreTests/Android.bp

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ android_test {
4242
],
4343

4444
libs: [
45-
"android.test.runner",
46-
"android.test.base",
47-
"android.test.mock",
45+
"android.test.runner.stubs",
46+
"android.test.base.stubs",
47+
"android.test.mock.stubs",
4848
"framework",
4949
"ext",
5050
"framework-res",

‎core/tests/PackageInstallerSessions/Android.bp

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ android_test {
3939
],
4040

4141
libs: [
42-
"android.test.runner",
43-
"android.test.base",
42+
"android.test.runner.stubs",
43+
"android.test.base.stubs",
4444
"framework",
4545
"framework-res",
4646
],

‎core/tests/PlatformCompatFramework/Android.bp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android_test {
1212
// Include all test java files.
1313
srcs: ["src/**/*.java"],
1414
libs: [
15-
"android.test.runner",
16-
"android.test.base",
15+
"android.test.runner.stubs.system",
16+
"android.test.base.stubs.system",
1717
],
1818
static_libs: [
1919
"junit",

‎core/tests/bandwidthtests/Android.bp

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ android_test {
2727
// Include all test java files.
2828
srcs: ["src/**/*.java"],
2929
libs: [
30-
"android.test.runner",
31-
"org.apache.http.legacy",
32-
"android.test.base",
30+
"android.test.runner.stubs",
31+
"org.apache.http.legacy.stubs",
32+
"android.test.base.stubs",
3333
],
3434
static_libs: [
3535
"junit",

‎core/tests/batterystatstests/BatteryStatsLoadTests/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android_test {
1616
"compatibility-device-util-axt",
1717
"junit",
1818
],
19-
libs: ["android.test.runner"],
19+
libs: ["android.test.runner.stubs.system"],
2020
platform_apis: true,
2121
certificate: "platform",
2222
}

‎core/tests/bugreports/Android.bp

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ android_test {
2626
srcs: ["src/**/*.java"],
2727
data: [":bugreport_artifacts"],
2828
libs: [
29-
"android.test.runner",
30-
"android.test.base",
29+
"android.test.runner.stubs.test",
30+
"android.test.base.stubs.test",
3131
],
3232
static_libs: [
3333
"android.tracing.flags-aconfig-java",

‎core/tests/companiontests/Android.bp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android_test {
1212
// Include all test java files.
1313
srcs: ["src/**/*.java"],
1414
libs: [
15-
"android.test.runner",
16-
"android.test.base",
15+
"android.test.runner.stubs.system",
16+
"android.test.base.stubs.system",
1717
],
1818
static_libs: ["junit"],
1919
platform_apis: true,

‎core/tests/coretests/Android.bp

+11-11
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ android_test {
106106
],
107107

108108
libs: [
109-
"android.test.runner",
110-
"org.apache.http.legacy",
111-
"android.test.base",
112-
"android.test.mock",
109+
"android.test.runner.stubs",
110+
"org.apache.http.legacy.stubs",
111+
"android.test.base.stubs",
112+
"android.test.mock.stubs",
113113
"framework",
114114
"ext",
115115
"framework-res",
@@ -156,8 +156,8 @@ android_app {
156156
use_resource_processor: false,
157157
libs: [
158158
"framework-res",
159-
"android.test.runner",
160-
"org.apache.http.legacy",
159+
"android.test.runner.stubs",
160+
"org.apache.http.legacy.stubs",
161161
],
162162
uses_libs: [
163163
"android.test.runner",
@@ -223,9 +223,9 @@ android_library {
223223
],
224224

225225
libs: [
226-
"android.test.runner",
227-
"android.test.base",
228-
"android.test.mock",
226+
"android.test.runner.stubs.system",
227+
"android.test.base.stubs.system",
228+
"android.test.mock.stubs.system",
229229
"framework",
230230
"framework-res",
231231
],
@@ -234,8 +234,8 @@ android_library {
234234
android_ravenwood_test {
235235
name: "FrameworksCoreTestsRavenwood",
236236
libs: [
237-
"android.test.runner",
238-
"android.test.base",
237+
"android.test.runner.stubs.system",
238+
"android.test.base.stubs.system",
239239
],
240240
static_libs: [
241241
"core-test-rules", // for libcore.dalvik.system.CloseGuardSupport

‎core/tests/devicestatetests/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android_test {
3232
"platform-test-annotations",
3333
"testng",
3434
],
35-
libs: ["android.test.runner"],
35+
libs: ["android.test.runner.stubs.system"],
3636
platform_apis: true,
3737
certificate: "platform",
3838
}

‎core/tests/featureflagtests/Android.bp

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ android_test {
1919
"androidx.test.rules",
2020
],
2121
libs: [
22-
"android.test.runner",
23-
"android.test.base",
22+
"android.test.runner.stubs.system",
23+
"android.test.base.stubs.system",
2424
],
2525
platform_apis: true,
2626
certificate: "platform",

‎core/tests/hdmitests/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android_test {
3232
"platform-test-annotations",
3333
"truth",
3434
],
35-
libs: ["android.test.runner"],
35+
libs: ["android.test.runner.stubs.system"],
3636
platform_apis: true,
3737
certificate: "platform",
3838
test_suites: ["device-tests"],

‎core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.bp

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ android_test {
2727
"junit",
2828
],
2929
libs: [
30-
"android.test.runner",
31-
"android.test.base",
30+
"android.test.runner.stubs.system",
31+
"android.test.base.stubs.system",
3232
],
3333

3434
platform_apis: true,

‎core/tests/mockingcoretests/Android.bp

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ android_test {
4444
],
4545

4646
libs: [
47-
"android.test.base",
48-
"android.test.mock",
49-
"android.test.runner",
47+
"android.test.base.stubs.system",
48+
"android.test.mock.stubs.system",
49+
"android.test.runner.stubs.system",
5050
],
5151

5252
// These are not normally accessible from apps so they must be explicitly included.

‎core/tests/packagemanagertests/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android_test {
1717
"frameworks-base-testutils",
1818
"mockito-target-minus-junit4",
1919
],
20-
libs: ["android.test.runner"],
20+
libs: ["android.test.runner.stubs.system"],
2121
platform_apis: true,
2222
certificate: "platform",
2323
}

‎core/tests/packagemonitortests/Android.bp

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ android_test {
3434
"mockito-target-minus-junit4",
3535
"truth",
3636
],
37-
libs: ["android.test.runner"],
37+
libs: ["android.test.runner.stubs.system"],
3838
platform_apis: true,
3939
certificate: "platform",
4040
test_suites: ["device-tests"],
@@ -52,7 +52,7 @@ android_test {
5252
"compatibility-device-util-axt",
5353
"frameworks-base-testutils",
5454
],
55-
libs: ["android.test.runner"],
55+
libs: ["android.test.runner.stubs.system"],
5656
platform_apis: true,
5757
certificate: "platform",
5858
test_suites: ["device-tests"],

‎core/tests/privacytests/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android_test {
1616
"androidx.test.rules",
1717
"truth",
1818
],
19-
libs: ["android.test.runner"],
19+
libs: ["android.test.runner.stubs.system"],
2020
platform_apis: true,
2121
certificate: "platform",
2222
test_suites: ["device-tests"],

‎core/tests/screenshothelpertests/Android.bp

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ android_test {
2525
],
2626

2727
libs: [
28-
"android.test.runner",
29-
"android.test.base",
30-
"android.test.mock",
28+
"android.test.runner.stubs.system",
29+
"android.test.base.stubs.system",
30+
"android.test.mock.stubs.system",
3131
],
3232

3333
platform_apis: true,

‎core/tests/systemproperties/Android.bp

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android_test {
2020
"ravenwood-junit",
2121
],
2222
libs: [
23-
"android.test.runner",
24-
"android.test.base",
23+
"android.test.runner.stubs.system",
24+
"android.test.base.stubs.system",
2525
],
2626
platform_apis: true,
2727
certificate: "platform",
@@ -37,8 +37,8 @@ android_ravenwood_test {
3737
"ravenwood-junit",
3838
],
3939
libs: [
40-
"android.test.runner",
41-
"android.test.base",
40+
"android.test.runner.stubs.system",
41+
"android.test.base.stubs.system",
4242
],
4343
srcs: [
4444
"src/**/*.java",

‎core/tests/timetests/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android_test {
1919
"platform-test-annotations",
2020
"truth",
2121
],
22-
libs: ["android.test.runner"],
22+
libs: ["android.test.runner.stubs.system"],
2323
certificate: "platform",
2424
test_suites: ["device-tests"],
2525
}

‎core/tests/utillib/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ java_library {
2828
srcs: ["**/*.java"],
2929

3030
static_libs: ["junit"],
31-
libs: ["android.test.base"],
31+
libs: ["android.test.base.stubs"],
3232
}

‎core/tests/utiltests/Android.bp

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ android_test {
3939
],
4040

4141
libs: [
42-
"android.test.runner",
43-
"android.test.base",
44-
"android.test.mock",
42+
"android.test.runner.stubs.system",
43+
"android.test.base.stubs.system",
44+
"android.test.mock.stubs.system",
4545
],
4646

4747
platform_apis: true,
@@ -55,7 +55,7 @@ android_test {
5555
android_ravenwood_test {
5656
name: "FrameworksUtilTestsRavenwood",
5757
libs: [
58-
"android.test.mock",
58+
"android.test.mock.stubs.system",
5959
],
6060
static_libs: [
6161
"androidx.annotation_annotation",

‎core/tests/vibrator/Android.bp

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ android_test {
2525
],
2626

2727
libs: [
28-
"android.test.runner",
29-
"android.test.base",
30-
"android.test.mock",
28+
"android.test.runner.stubs",
29+
"android.test.base.stubs",
30+
"android.test.mock.stubs",
3131
"framework",
3232
"framework-res",
3333
],

0 commit comments

Comments
 (0)