| Index: third_party/robolectric/BUILD.gn
|
| diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn
|
| index 2f083a6856d50e2b080f51fe935eb36377341f21..2a118bca9f0a5fb38dde09e7573cc586d586e02a 100644
|
| --- a/third_party/robolectric/BUILD.gn
|
| +++ b/third_party/robolectric/BUILD.gn
|
| @@ -95,8 +95,11 @@ java_library("robolectric_java") {
|
| "robolectric/robolectric/src/main/java/org/robolectric/util/FragmentTestUtil.java",
|
| "robolectric/robolectric/src/main/java/org/robolectric/util/ServiceController.java",
|
| ]
|
| - additional_jar_files = [ rebase_path(
|
| - "robolectric/robolectric/src/main/resources/robolectric-version.properties") + ":robolectric-version.properties" ]
|
| + additional_jar_files = [ [
|
| + rebase_path(
|
| + "robolectric/robolectric/src/main/resources/robolectric-version.properties"),
|
| + "robolectric-version.properties",
|
| + ] ]
|
| }
|
|
|
| java_library("robolectric_annotations_java") {
|
| @@ -580,23 +583,32 @@ template("shadows_core") {
|
| ]
|
| if (host_os == "linux") {
|
| additional_jar_files = [
|
| - rebase_path("../sqlite4java/lib/linux-x86_64/libsqlite4java.so") +
|
| - ":linux-x86_64/libsqlite4java.so",
|
| - rebase_path("../sqlite4java/lib/linux-x86/libsqlite4java.so") +
|
| - ":linux-x86/libsqlite4java.so",
|
| + [
|
| + rebase_path("../sqlite4java/lib/linux-x86_64/libsqlite4java.so"),
|
| + "linux-x86_64/libsqlite4java.so",
|
| + ],
|
| + [
|
| + rebase_path("../sqlite4java/lib/linux-x86/libsqlite4java.so"),
|
| + "linux-x86/libsqlite4java.so",
|
| + ],
|
| ]
|
| }
|
| if (host_os == "mac") {
|
| - additional_jar_files =
|
| - [ rebase_path("../sqlite4java/lib/mac-x86_64/libsqlite4java.jnilib") +
|
| - ":mac-x86_64/libsqlite4java.jnilib" ]
|
| + additional_jar_files = [ [
|
| + rebase_path("../sqlite4java/lib/mac-x86_64/libsqlite4java.jnilib"),
|
| + "mac-x86_64/libsqlite4java.jnilib",
|
| + ] ]
|
| }
|
| if (host_os == "win") {
|
| additional_jar_files = [
|
| - rebase_path("../sqlite4java/lib/windows-x86/sqlite4java.dll") +
|
| - ":windows-x86/sqlite4java.dll",
|
| - rebase_path("../sqlite4java/lib/windows-x86_64/sqlite4java.dll") +
|
| - ":windows-x86_64/sqlite4java.dll",
|
| + [
|
| + rebase_path("../sqlite4java/lib/windows-x86/sqlite4java.dll"),
|
| + "windows-x86/sqlite4java.dll",
|
| + ],
|
| + [
|
| + rebase_path("../sqlite4java/lib/windows-x86_64/sqlite4java.dll"),
|
| + "windows-x86_64/sqlite4java.dll",
|
| + ],
|
| ]
|
| }
|
| java_files = _shadows_core_java_files
|
|
|