Index: chrome/android/BUILD.gn |
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn |
index 91421b233f979f673259d285e526868351806685..e27e888a5d312676596568fd959f59fccd3d7659 100644 |
--- a/chrome/android/BUILD.gn |
+++ b/chrome/android/BUILD.gn |
@@ -471,7 +471,6 @@ android_library("chrome_test_java") { |
"//third_party/jsr-305:jsr_305_javalib", |
"//third_party/junit", |
"//ui/android:ui_java", |
- "//ui/android:ui_javatests", |
"//ui/base/mojo:mojo_bindings_java", |
google_play_services_library, |
] |
@@ -622,9 +621,8 @@ shared_library("chrome") { |
if (enable_vr) { |
# Ensure libgvr static library appears before gcc library in linking order. |
# See https://crbug.com/704305 for details. |
- libs = [ |
- "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a", |
- ] |
+ libs = |
+ [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] |
} |
if (is_android && use_order_profiling) { |
@@ -715,9 +713,7 @@ if (!android_64bit_target_cpu || |
if (enable_vr) { |
# Ensure libgvr static library appears before gcc library in linking order. |
# See https://crbug.com/704305 for details. |
- libs = [ |
- "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a", |
- ] |
+ libs = [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] |
} |
configs -= [ "//build/config/android:hide_all_but_jni_onload" ] |
@@ -753,9 +749,8 @@ shared_library("chrome_sync_shell") { |
if (enable_vr) { |
# Ensure libgvr static library appears before gcc library in linking order. |
# See https://crbug.com/704305 for details. |
- libs = [ |
- "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a", |
- ] |
+ libs = |
+ [ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] |
} |
} |