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

Unified Diff: sync/BUILD.gn

Issue 570203002: Make chrome_shell_apk build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-chrome-jamesr
Patch Set: Rebase add chrome_version_java/page_connection_info_javagen Created 6 years, 2 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 | « printing/printing.gyp ('k') | sync/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/BUILD.gn
diff --git a/sync/BUILD.gn b/sync/BUILD.gn
index 9b187cff1dba86afa66566df8d2f16fcf99f23be..2ba15cb0805d782405e13e0b66b3e8483e5334ff 100644
--- a/sync/BUILD.gn
+++ b/sync/BUILD.gn
@@ -694,6 +694,8 @@ static_library("test_support_sync_fake_server") {
"//sync",
]
+ forward_dependent_configs_from = [ "//third_party/protobuf:protobuf_lite" ]
+
configs += [ "//build/config/compiler:wexit_time_destructors" ]
}
@@ -764,4 +766,49 @@ if (!is_ios) {
}
}
-#TODO(GYP): Need to port sync_android.gypi and Android test targets.
+if (is_android) {
+ import("//build/config/android/rules.gni")
+
+ # GYP: //sync/sync_tests.gypi:fake_server_jni
+ generate_jni("fake_server_jni") {
+ testonly = true
+ jni_package = "sync/test/fake_server"
+ sources = [
+ "//chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/FakeServerHelper.java"
+ ]
+ }
+
+ # GYP: //sync/sync_tests.gypi:sync_java_test_support
+ android_library("sync_java_test_support") {
+ testonly = true
+ deps = [
+ "android:sync_java",
+ "//base:base_java",
+ "//base:base_java_test_support",
+ "//third_party/jsr-305:jsr_305_javalib",
+ ]
+ DEPRECATED_java_in_dir = "test/android/javatests/src"
+ }
+
+ # GYP: //sync/sync_tests.gypi:test_support_sync_fake_server_android
+ static_library("test_support_sync_fake_server_android") {
+ testonly = true
+ sources = [
+ "test/fake_server/android/fake_server_helper_android.cc",
+ "test/fake_server/android/fake_server_helper_android.h",
+ ]
+ deps = [
+ ":fake_server_jni",
+ ":test_support_sync_fake_server",
+ "//base",
+ ]
+ }
+
+ # GYP: //sync/sync_tests.gypi:sync_unit_tests_apk
+ unittest_apk("sync_unit_tests_apk") {
+ unittests_dep = ":sync_unit_tests"
+ deps = [
+ ":sync_unit_tests",
+ ]
+ }
+}
« no previous file with comments | « printing/printing.gyp ('k') | sync/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698