Chromium Code Reviews| Index: components/web_restrictions/BUILD.gn |
| diff --git a/components/web_restrictions/BUILD.gn b/components/web_restrictions/BUILD.gn |
| index 141449a859ade67be0802bccbb1cbbc49c2b6152..ec28b4a4402b5278a7343e4e6d974530347fbabc 100644 |
| --- a/components/web_restrictions/BUILD.gn |
| +++ b/components/web_restrictions/BUILD.gn |
| @@ -3,18 +3,114 @@ |
| # found in the LICENSE file. |
| import("//build/config/android/rules.gni") |
| +import("//testing/test.gni") |
| -# GYP: components.gyp:web_restrictions_java |
| -android_library("web_restrictions_java") { |
| - java_files = [ "java/src/org/chromium/components/webrestrictions/WebRestrictionsContentProvider.java" ] |
| -} |
| +if (is_android) { |
| + # GYP: components.gyp:web_restrictions_java |
| + android_library("web_restrictions_java") { |
| + java_files = [ |
| + "browser/java/src/org/chromium/components/webrestrictions/WebRestrictionsContentProvider.java", |
| + "browser/java/src/org/chromium/components/webrestrictions/WebRestrictionsClient.java", |
| + ] |
| + deps = [ |
| + "//base:base_java", |
| + ] |
| + } |
| + |
| + # GYP: //components/components_test.gyp:components_junit_tests |
| + junit_binary("components_web_restrictions_junit_tests") { |
| + java_files = [ |
| + "browser/junit/src/org/chromium/components/webrestrictions/WebRestrictionsContentProviderTest.java", |
| + "browser/junit/src/org/chromium/components/webrestrictions/WebRestrictionsClientTest.java", |
| + ] |
| + deps = [ |
| + ":web_restrictions_java", |
| + "//base:base_java", |
| + "//third_party/junit:hamcrest", |
| + ] |
| + } |
| + |
| + generate_jni("web_restrictions_jni_headers") { |
| + sources = [ |
| + "browser/java/src/org/chromium/components/webrestrictions/WebRestrictionsClient.java", |
| + ] |
| + jni_package = "web_restrictions" |
| + } |
| + |
| + # GYP: components.gyp:web_restrictions_browser |
| + static_library("browser") { |
| + sources = [ |
| + "browser/web_restrictions_client.cc", |
| + "browser/web_restrictions_client.h", |
| + "browser/web_restrictions_resource_throttle.cc", |
| + "browser/web_restrictions_resource_throttle.h", |
| + ] |
| + deps = [ |
| + ":web_restrictions_jni_headers", |
| + "//base", |
| + "//content/public/browser", |
| + "//net", |
| + ] |
| + } |
| + |
| + # GYP: components.gyp:web_restrictions_renderer |
| + static_library("renderer") { |
| + sources = [ |
| + "renderer/web_restrictions_gin_wrapper.cc", |
| + "renderer/web_restrictions_gin_wrapper.h", |
| + ] |
| + deps = [ |
| + "//base", |
| + "//content/public/renderer", |
| + "//gin", |
| + "//third_party/WebKit/public:blink_headers", |
| + ] |
| + } |
| + |
| + generate_jni("test_support_jni_headers") { |
| + sources = [ |
| + "browser/javatest/src/org/chromium/components/webrestrictions/MockWebRestrictionsClient.java", |
| + ] |
| + jni_package = "web_restrictions" |
| + deps = [ |
| + ":web_restrictions_java", |
| + ] |
| + } |
| + |
| + android_library("test_support_java") { |
| + java_files = [ "browser/javatest/src/org/chromium/components/webrestrictions/MockWebRestrictionsClient.java" ] |
| + deps = [ |
| + ":web_restrictions_java", |
| + "//base:base_java", |
| + ] |
| + } |
| + |
| + static_library("test_support") { |
|
Bernhard Bauer
2016/02/23 18:09:12
Should this be a source_set?
brettw
2016/02/23 19:12:26
Yeah, we should make all static_libraries source s
aberent
2016/02/24 10:59:40
Done.
aberent
2016/02/24 10:59:40
Done.
|
| + sources = [ |
| + "browser/mock_web_restrictions_client.cc", |
| + "browser/mock_web_restrictions_client.h", |
| + ] |
| + deps = [ |
| + ":test_support_jni_headers", |
| + "//base", |
| + ] |
| + } |
| -# GYP: //components/components_test.gyp:components_junit_tests |
| -junit_binary("components_web_restrictions_junit_tests") { |
| - java_files = [ "junit/src/org/chromium/components/webrestrictions/WebRestrictionsContentProviderTest.java" ] |
| - deps = [ |
| - ":web_restrictions_java", |
| - "//base:base_java", |
| - "//third_party/junit:hamcrest", |
| - ] |
| + source_set("unit_tests") { |
| + testonly = true |
| + sources = [ |
| + "browser/web_restrictions_client_unittest.cc", |
| + "browser/web_restrictions_resource_throttle_unittest.cc", |
| + ] |
| + deps = [ |
| + ":browser", |
| + ":test_support", |
| + "//base", |
| + "//base/test:test_support", |
| + "//content/test:test_support", |
| + "//net", |
| + "//testing/gtest", |
| + "//url", |
| + ] |
| + } |
| } |