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

Unified Diff: blimp/client/BUILD.gn

Issue 1757153002: Revert of Blimp: add support for SSL connections. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « no previous file | blimp/client/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/BUILD.gn
index 465adb7967cb4ed71c7971d7b07421fee7fbd4ce..d2ddc2b1414c7a1d8fca8167ed7d7ac0dd91009a 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/BUILD.gn
@@ -27,7 +27,6 @@
defines = [ "BLIMP_CLIENT_IMPLEMENTATION=1" ]
public_deps = [
- "//components/safe_json",
"//ui/events",
]
@@ -50,6 +49,12 @@
sources = []
+ # TODO(dtrainor): Fix the test harness to allow this to run on Android.
+ # See crbug.com/588240.
+ if (is_linux) {
+ sources += [ "session/assignment_source_unittest.cc" ]
+ }
+
deps = [
":blimp_client",
"//base",
@@ -58,19 +63,6 @@
"//testing/gmock",
"//testing/gtest",
]
-
- data = []
-
- # TODO(dtrainor): Fix the test harness to allow this to run on Android.
- # See crbug.com/588240.
- if (is_linux) {
- sources += [ "session/assignment_source_unittest.cc" ]
- deps += [
- "//components/safe_json:test_support",
- "//net:test_support",
- ]
- data += [ "session/test_selfsigned_cert.pem" ]
- }
}
source_set("app_unit_tests") {
@@ -350,7 +342,6 @@
"//base",
"//blimp/common/proto",
"//blimp/net:blimp_net",
- "//components/safe_json/android:safe_json_jni_headers",
"//skia",
"//ui/gfx/geometry",
"//ui/gl",
@@ -384,7 +375,6 @@
":blimp_java",
":blimp_java_resources",
"//base:base_java",
- "//components/safe_json/android:safe_json_java",
"//net/android:net_java",
google_play_services_resources,
]
« no previous file with comments | « no previous file | blimp/client/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698