Move third_party/robolectric cipd package to a cipd/ subdirectory.
Cog/cider do not allow cipd packages in the same directory as git files. Bug: 362771880 Change-Id: I9c613f4dd54783ad4e07bb9efd606c0c03d123a7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5823835 Commit-Queue: Brian Ryner <bryner@google.com> Auto-Submit: Brian Ryner <bryner@google.com> Reviewed-by: Andrew Grieve <agrieve@chromium.org> Cr-Commit-Position: refs/heads/main@{#1348282}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
e79b023d2f
commit
0e81e84aed
2
DEPS
2
DEPS
@ -2417,7 +2417,7 @@ deps = {
|
||||
'condition': 'checkout_android',
|
||||
},
|
||||
|
||||
'src/third_party/robolectric': {
|
||||
'src/third_party/robolectric/cipd': {
|
||||
'packages': [
|
||||
{
|
||||
'package': 'chromium/third_party/robolectric',
|
||||
|
@ -938,7 +938,7 @@ template("test_runner_script") {
|
||||
deps += [ ":${invoker.test_suite}$build_config_target_suffix" ]
|
||||
|
||||
_rebased_robolectric_runtime_deps_dir =
|
||||
rebase_path("//third_party/robolectric/lib", root_build_dir)
|
||||
rebase_path("//third_party/robolectric/cipd/lib", root_build_dir)
|
||||
_rebased_resource_apk = rebase_path(invoker.resource_apk, root_build_dir)
|
||||
executable_args += [
|
||||
"--resource-apk",
|
||||
|
@ -157,7 +157,7 @@ settings below are inside Window > Preferences.
|
||||
* Select a Java 8 JRE
|
||||
* User Entries:
|
||||
* Add JARs...
|
||||
* Select the following JAR file from `third_party/robolectric/lib`:
|
||||
* Select the following JAR file from `third_party/robolectric/cipd/lib`:
|
||||
* `android-all-5.0.0_r2-robolectric-1.jar`
|
||||
* JRE tab:
|
||||
* Execution environment: Select the Java 8 JRE
|
||||
|
2
third_party/.gitignore
vendored
2
third_party/.gitignore
vendored
@ -117,8 +117,6 @@
|
||||
/qemu-linux-arm64
|
||||
/qemu-linux-x64
|
||||
/qemu-mac-x64
|
||||
/robolectric/lib/
|
||||
/robolectric/robolectric
|
||||
/rust-src
|
||||
/rust-toolchain/
|
||||
/rust-toolchain-intermediate
|
||||
|
2
third_party/robolectric/.gitignore
vendored
Normal file
2
third_party/robolectric/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
/cipd/
|
||||
|
28
third_party/robolectric/BUILD.gn
vendored
28
third_party/robolectric/BUILD.gn
vendored
@ -7,24 +7,24 @@ import("//build/config/android/rules.gni")
|
||||
group("robolectric_runtime_jars") {
|
||||
testonly = true
|
||||
data = [
|
||||
"lib/android-all-instrumented-5.0.2_r3-robolectric-r0-i6.jar",
|
||||
"lib/android-all-instrumented-6.0.1_r3-robolectric-r1-i6.jar",
|
||||
"lib/android-all-instrumented-7.0.0_r1-robolectric-r1-i6.jar",
|
||||
"lib/android-all-instrumented-7.1.0_r7-robolectric-r1-i6.jar",
|
||||
"lib/android-all-instrumented-8.0.0_r4-robolectric-r1-i6.jar",
|
||||
"lib/android-all-instrumented-8.1.0-robolectric-4611349-i6.jar",
|
||||
"lib/android-all-instrumented-9-robolectric-4913185-2-i6.jar",
|
||||
"lib/android-all-instrumented-10-robolectric-5803371-i6.jar",
|
||||
"lib/android-all-instrumented-11-robolectric-6757853-i6.jar",
|
||||
"lib/android-all-instrumented-12-robolectric-7732740-i6.jar",
|
||||
"lib/android-all-instrumented-12.1-robolectric-8229987-i6.jar",
|
||||
"lib/android-all-instrumented-13-robolectric-9030017-i6.jar",
|
||||
"lib/android-all-instrumented-14-robolectric-10818077-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-5.0.2_r3-robolectric-r0-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-6.0.1_r3-robolectric-r1-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-7.0.0_r1-robolectric-r1-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-7.1.0_r7-robolectric-r1-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-8.0.0_r4-robolectric-r1-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-8.1.0-robolectric-4611349-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-9-robolectric-4913185-2-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-10-robolectric-5803371-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-11-robolectric-6757853-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-12-robolectric-7732740-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-12.1-robolectric-8229987-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-13-robolectric-9030017-i6.jar",
|
||||
"cipd/lib/android-all-instrumented-14-robolectric-10818077-i6.jar",
|
||||
]
|
||||
}
|
||||
|
||||
# Robolectric tests compile against the robolectric sdk. This should be kept in
|
||||
# sync with the latest version in //third_party/android_sdk.
|
||||
android_system_java_prebuilt("robolectric_test_sdk_java") {
|
||||
jar_path = "lib/android-all-14-robolectric-10818077.jar"
|
||||
jar_path = "cipd/lib/android-all-14-robolectric-10818077.jar"
|
||||
}
|
||||
|
Reference in New Issue
Block a user