diff options
| -rw-r--r-- | BUILD.gn | 7 | ||||
| -rw-r--r-- | build/gn_migration.gypi | 12 | ||||
| -rw-r--r-- | chrome/android/BUILD.gn | 5 | ||||
| -rw-r--r-- | components/invalidation/impl/BUILD.gn | 2 | ||||
| -rw-r--r-- | components/policy/android/BUILD.gn | 11 |
5 files changed, 28 insertions, 9 deletions
@@ -240,8 +240,14 @@ group("both_gn_and_gyp") { if (is_android) { deps += [ "//base/android/linker:chromium_android_linker", + "//base:base_junit_tests", "//build/android/gyp/test:hello_world", "//build/android/rezip", + "//components/invalidation/impl:components_invalidation_impl_junit_tests", + "//components/policy/android:components_policy_junit_tests", + "//content/public/android:content_junit_tests", + "//net/android:net_junit_tests", + "//testing/android/junit:junit_unittests", "//third_party/errorprone:chromium_errorprone", "//tools/android:android_tools", "//tools/android/heap_profiler:heap_profiler_unittests", @@ -283,6 +289,7 @@ group("both_gn_and_gyp") { if (!is_chromecast) { deps += [ "//android_webview:system_webview_apk", + "//chrome/android:chrome_junit_tests", "//chrome/android:chrome_public_apk", "//chrome/android:chrome_public_test_apk", "//chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk", diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index 718c40e..24281ea 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -176,6 +176,7 @@ }], ['OS=="android"', { 'dependencies': [ + '../base/base.gyp:base_junit_tests', '../base/base.gyp:base_unittests_apk', '../base/base.gyp:chromium_android_linker', '../breakpad/breakpad.gyp:breakpad_unittests_deps', @@ -188,19 +189,23 @@ '../cc/cc_tests.gyp:cc_unittests_apk', #"//clank" TODO(GYP) - conditional somehow? '../components/components_tests.gyp:components_browsertests_apk', + '../components/components_tests.gyp:components_junit_tests', '../components/components_tests.gyp:components_unittests_apk', '../content/content_shell_and_tests.gyp:content_browsertests_apk', '../content/content_shell_and_tests.gyp:content_gl_tests_apk', + '../content/content_shell_and_tests.gyp:content_junit_tests', '../content/content_shell_and_tests.gyp:content_shell_apk', '../content/content_shell_and_tests.gyp:content_unittests_apk', '../device/device_tests.gyp:device_unittests_apk', '../gpu/gpu.gyp:gpu_unittests_apk', '../media/media.gyp:media_unittests_apk', '../media/midi/midi.gyp:midi_unittests_apk', + '../net/net.gyp:net_junit_tests', '../net/net.gyp:net_unittests_apk', '../skia/skia_tests.gyp:skia_unittests_apk', '../sql/sql.gyp:sql_unittests_apk', '../sync/sync.gyp:sync_unit_tests_apk', + '../testing/android/junit/junit_test.gyp:junit_unit_tests', '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_heap_unittests_apk', '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_platform_unittests_apk', '../third_party/WebKit/Source/web/web_tests.gyp:webkit_unit_tests_apk', @@ -250,6 +255,7 @@ '../chrome/android/chrome_apk.gyp:chrome_public_apk', '../chrome/android/chrome_apk.gyp:chrome_public_test_apk', '../chrome/chrome.gyp:chromedriver_webview_shell_apk', + '../chrome/chrome.gyp:chrome_junit_tests', '../chrome/chrome.gyp:unit_tests_apk', '../third_party/custom_tabs_client/custom_tabs_client.gyp:custom_tabs_client_example_apk', ], @@ -741,25 +747,20 @@ ['OS=="android"', { 'dependencies': [ '../base/base.gyp:base_perftests_apk', - '../base/base.gyp:base_junit_tests', '../cc/cc_tests.gyp:cc_perftests_apk', '../components/components.gyp:cronet_sample_apk', '../components/components.gyp:cronet_sample_test_apk', '../components/components.gyp:cronet_test_apk', '../components/components.gyp:cronet_test_instrumentation_apk', '../components/components.gyp:cronet_perf_test_apk', - '../components/components_tests.gyp:components_junit_tests', '../content/content_shell_and_tests.gyp:chromium_linker_test_apk', - '../content/content_shell_and_tests.gyp:content_junit_tests', '../content/content_shell_and_tests.gyp:content_shell_test_apk', '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk', '../gpu/gpu.gyp:gl_tests_apk', '../gpu/gpu.gyp:gpu_perftests_apk', '../ipc/ipc.gyp:ipc_tests_apk', '../media/media.gyp:media_perftests_apk', - '../net/net.gyp:net_junit_tests', '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps', - '../testing/android/junit/junit_test.gyp:junit_unit_tests', '../tools/android/android_tools.gyp:memconsumer', '../ui/android/ui_android.gyp:ui_android_unittests_apk', '../url/url.gyp:url_unittests', @@ -777,7 +778,6 @@ '../android_webview/android_webview_shell.gyp:system_webview_shell_page_cycler_apk', '../chrome/android/chrome_apk.gyp:chrome_sync_shell_apk', '../chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk', - '../chrome/chrome.gyp:chrome_junit_tests', '../remoting/remoting.gyp:remoting_apk', ], }], diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index b49cac5..8ab31cf 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -233,8 +233,7 @@ junit_binary("chrome_junit_tests") { "junit/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtilsTest.java", "junit/src/org/chromium/chrome/browser/gcore/GoogleApiClientConnectionHelperTest.java", - # TODO(mlamouri): add the requirements dependencies for this test. - #"junit/src/org/chromium/chrome/browser/invalidations/InvalidationControllerTest.java", + "junit/src/org/chromium/chrome/browser/invalidations/InvalidationControllerTest.java", "junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java", "junit/src/org/chromium/chrome/browser/media/remote/MediaUrlResolverTest.java", "junit/src/org/chromium/chrome/browser/media/remote/RemoteVideoInfoTest.java", @@ -251,8 +250,10 @@ junit_binary("chrome_junit_tests") { "//base:base_java", "//base:base_java_test_support", "//base:base_junit_test_support", + "//components/invalidation/impl:java", "//sync:sync_java_test_support", "//sync/android:sync_java", + "//third_party/cacheinvalidation:cacheinvalidation_javalib", "//third_party/junit:hamcrest", "//third_party/android_tools:android_support_v7_mediarouter_java", google_play_services_library, diff --git a/components/invalidation/impl/BUILD.gn b/components/invalidation/impl/BUILD.gn index a358cef..3045d67 100644 --- a/components/invalidation/impl/BUILD.gn +++ b/components/invalidation/impl/BUILD.gn @@ -213,7 +213,7 @@ if (is_android) { ] DEPRECATED_java_in_dir = "android/javatests/src" } - junit_binary("junit_tests") { + junit_binary("components_invalidation_impl_junit_tests") { java_files = [ "android/junit/src/org/chromium/components/invalidation/PendingInvalidationTest.java" ] deps = [ ":java", diff --git a/components/policy/android/BUILD.gn b/components/policy/android/BUILD.gn index a3ef6ba..53bc165 100644 --- a/components/policy/android/BUILD.gn +++ b/components/policy/android/BUILD.gn @@ -28,3 +28,14 @@ generate_jni("jni_headers") { sources = _jni_sources jni_package = "policy" } + +junit_binary("components_policy_junit_tests") { + java_files = [ + "junit/src/org/chromium/policy/AbstractAppRestrictionsProviderTest.java", + "junit/src/org/chromium/policy/CombinedPolicyProviderTest.java", + ] + deps = [ + "//base:base_java", + ":policy_java", + ] +} |