Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3182)

Unified Diff: chrome/android/BUILD.gn

Issue 2793033003: [Android] Remove org.apache.http from proguard flags and gn. (Closed)
Patch Set: rebase and git cl format Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/secondary/third_party/android_tools/BUILD.gn ('k') | chrome/test/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 91421b233f979f673259d285e526868351806685..088a97042d7ab38715350eb1dc827729ea8c35d1 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -464,7 +464,6 @@ android_library("chrome_test_java") {
"//third_party/android_tools:android_support_transition_java",
"//third_party/android_tools:android_support_v7_appcompat_java",
"//third_party/android_tools:android_support_v7_recyclerview_java",
- "//third_party/android_tools:legacy_http_javalib",
"//third_party/cacheinvalidation:cacheinvalidation_javalib",
"//third_party/custom_tabs_client:custom_tabs_support_java",
"//third_party/hamcrest:hamcrest_java",
@@ -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" ]
}
}
« no previous file with comments | « build/secondary/third_party/android_tools/BUILD.gn ('k') | chrome/test/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698