diff options
| -rw-r--r-- | BUILD.gn | 1 | ||||
| -rwxr-xr-x | build/android/gyp/find.py | 3 | ||||
| -rw-r--r-- | build/config/android/rules.gni | 9 | ||||
| -rw-r--r-- | chrome/android/BUILD.gn | 118 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 6 | ||||
| -rw-r--r-- | chrome/test/android/BUILD.gn | 23 | ||||
| -rw-r--r-- | chrome/test/chromedriver/test/webview_shell/BUILD.gn | 18 | ||||
| -rw-r--r-- | components/bookmarks.gypi | 6 |
8 files changed, 170 insertions, 14 deletions
@@ -169,6 +169,7 @@ group("root") { "//third_party/openmax_dl/dl", "//content/shell/android:content_shell_apk", "//chrome/android:chrome_shell_apk", + "//chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk", "//ui/android:ui_java", "//third_party/android_tools:android_gcm_java", "//third_party/android_tools:uiautomator_java", diff --git a/build/android/gyp/find.py b/build/android/gyp/find.py index 07132c7..a9f1d49 100755 --- a/build/android/gyp/find.py +++ b/build/android/gyp/find.py @@ -19,6 +19,9 @@ def main(argv): options, directories = parser.parse_args(argv) for d in directories: + if not os.path.exists(d): + print >> sys.stderr, '%s does not exist' % d + return 1 for root, _, filenames in os.walk(d): for f in fnmatch.filter(filenames, options.pattern): print os.path.join(root, f) diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index 0c9dbf221..344202c 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -1203,3 +1203,12 @@ template("proto_java_library") { ] } } + +# TODO(GYP): implement this. +template("uiautomator_test") { + if (defined(invoker.testonly)) { testonly = invoker.testonly } + assert(target_name != "") + assert(invoker.deps != [] || true) + group(target_name) { + } +} diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 202fcd3..076e956 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -349,17 +349,6 @@ copy_ex("chrome_shell_assets") { } } -#TODO(GYP): -#'variables': { -#'conditions': [ -#['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { -## Only enable the chromium linker on regular builds, since the -## component build crashes on Android 4.4. See b/11379966 -#'use_chromium_linker': '1', -#}], -#], -#}, - # GYP: //chrome/chrome_browser.gypi:chrome_shell_apk android_apk("chrome_shell_apk") { testonly = true @@ -375,6 +364,18 @@ android_apk("chrome_shell_apk") { "$root_build_dir/lib.stripped/libchrome_shell.so" ] asset_location = chrome_shell_assets_dir + +#TODO(GYP): +#'variables': { +#'conditions': [ +#['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { +## Only enable the chromium linker on regular builds, since the +## component build crashes on Android 4.4. See b/11379966 +#'use_chromium_linker': '1', +#}], +#], +#}, + } # GYP: //chrome/chrome_browser.gypi:chrome_sync_shell_apk @@ -394,6 +395,101 @@ android_apk("chrome_sync_shell_apk") { asset_location = chrome_shell_assets_dir } +# GYP: part of //chrome/chrome_tests.gypi:chrome_shell_test_apk +android_library("chrome_javatests") { + testonly = true + DEPRECATED_java_in_dir = "javatests/src" + deps = [ + ":chrome_java", + ":chrome_java_resources", + ":chrome_shell_java", + ":chrome_shell_resources", + ":chrome_shell_test_java", + "//base:base_java", + "//base:base_java_test_support", + "//chrome/test/android:chrome_java_test_support", + "//components/bookmarks/common/android:bookmarks_java", + "//components/dom_distiller/android:dom_distiller_core_java", + "//components/invalidation:java", + "//content/public/android:content_java", + "//content/public/test/android:content_java_test_support", + "//printing:printing_java", + "//sync/android:sync_java", + "//sync:sync_java_test_support", + "//third_party/cacheinvalidation:cacheinvalidation_javalib", + "//third_party/cacheinvalidation:cacheinvalidation_proto_java", + "//third_party/jsr-305:jsr_305_javalib", + "//ui/android:ui_java", + ] +} + +android_library("chrome_shell_test_java") { + testonly = true + deps = [ + ":chrome_java", + ":chrome_shell_java", + "//base:base_java", + "//base:base_java_test_support", + "//chrome/test/android:chrome_java_test_support", + "//content/public/android:content_java", + "//content/public/test/android:content_java_test_support", + "//ui/android:ui_java", + ] + DEPRECATED_java_in_dir = "shell/javatests/src" +} + +# GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk +android_apk("chrome_shell_test_apk") { + testonly = true + deps = [ + ":chrome_javatests", + ":chrome_shell_test_java", + "//sync/android:sync_javatests", + ] + apk_name = "ChromeShellTest" + android_manifest = "shell/javatests/AndroidManifest.xml" +} + +# GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk +android_apk("chrome_sync_shell_test_apk") { + testonly = true + deps = [ + ":chrome_java", + ":chrome_shell_java", + ":chrome_shell_test_java", + "//base:base_java", + "//base:base_java_test_support", + "//chrome/test/android:chrome_java_test_support", + "//components/invalidation:java", + "//content/public/android:content_java", + "//content/public/test/android:content_java_test_support", + "//sync/android:sync_java", + "//sync:sync_java_test_support", + ] + apk_name = "ChromeSyncShellTest" + DEPRECATED_java_in_dir = "sync_shell/javatests/src" + android_manifest = "sync_shell/javatests/AndroidManifest.xml" +} + + +# GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests_java +android_library("uiautomator_tests_java") { + testonly = true + DEPRECATED_java_in_dir = "uiautomator_tests/src" + deps = [ + "//base:base_java_test_support", + "//third_party/android_tools:uiautomator_java", + ] +} + +# GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests +uiautomator_test("uiautomator_tests") { + testonly = true + deps = [ + ":uiautomator_tests_java" + ] +} + # GYP: //chrome/chrome_android.gypi:chrome_version_java chrome_version_java_dir = "$root_gen_dir/templates/chrome_version_java" chrome_version_java_file = "$chrome_version_java_dir/org/chromium/chrome/browser/ChromeVersionConstants.java" diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index cfaa004..f7e0c1b 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2867,6 +2867,7 @@ ['OS == "android"', { 'targets': [ { + # GN: //chrome/android:chrome_shell_test_apk 'target_name': 'chrome_shell_test_apk', 'type': 'none', 'dependencies': [ @@ -2888,6 +2889,7 @@ 'includes': [ '../build/java_apk.gypi' ], }, { + # GN: //chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk 'target_name': 'chromedriver_webview_shell_apk', 'type': 'none', 'variables': { @@ -2898,6 +2900,7 @@ 'includes': [ '../build/java_apk.gypi' ], }, { + # GN: //chrome/android:uiautomator_tests_java 'target_name': 'chrome_shell_uiautomator_tests_java', 'type': 'none', 'variables': { @@ -2910,6 +2913,7 @@ 'includes': [ '../build/java.gypi' ], }, { + # GN: //chrome/android:uiautomator_tests 'target_name': 'chrome_shell_uiautomator_tests', 'type': 'none', 'dependencies': [ @@ -2918,6 +2922,7 @@ 'includes': [ '../build/uiautomator_test.gypi' ], }, { + # GN: //chrome/android:chrome_sync_shell_test_apk 'target_name': 'chrome_sync_shell_test_apk', 'type': 'none', 'dependencies': [ @@ -2937,6 +2942,7 @@ 'includes': [ '../build/java_apk.gypi' ], }, { + # GN: //chrome/test/android:chrome_java_test_support 'target_name': 'chrome_java_test_support', 'type': 'none', 'variables': { diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn new file mode 100644 index 0000000..30106ec --- /dev/null +++ b/chrome/test/android/BUILD.gn @@ -0,0 +1,23 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/android/rules.gni") + + +# GYP: //chrome/chrome_tests.gypi:chrome_java_test_support +android_library("chrome_java_test_support") { + testonly = true + DEPRECATED_java_in_dir = "javatests/src" + deps = [ + "//base:base_java", + "//base:base_java_test_support", + "//chrome/android:chrome_java", + "//chrome/android:chrome_java_resources", + "//components/invalidation:java", + "//content/public/android:content_java", + "//content/public/test/android:content_java_test_support", + "//sync/android:sync_java", + "//sync:sync_java_test_support", + ] +} diff --git a/chrome/test/chromedriver/test/webview_shell/BUILD.gn b/chrome/test/chromedriver/test/webview_shell/BUILD.gn new file mode 100644 index 0000000..90c5a34 --- /dev/null +++ b/chrome/test/chromedriver/test/webview_shell/BUILD.gn @@ -0,0 +1,18 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/android/rules.gni") + + +# GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk +android_resources("chromedriver_webview_shell_resources") { + resource_dirs = [ "java/res" ] + android_manifest = "java/AndroidManifest.xml" +} +android_apk("chromedriver_webview_shell_apk") { + apk_name = "ChromeDriverWebViewShell" + deps = [ ":chromedriver_webview_shell_resources" ] + DEPRECATED_java_in_dir = "java/src" + android_manifest = "java/AndroidManifest.xml" +} diff --git a/components/bookmarks.gypi b/components/bookmarks.gypi index ffdfd1b..6f6b770b 100644 --- a/components/bookmarks.gypi +++ b/components/bookmarks.gypi @@ -125,7 +125,7 @@ ['OS=="android"', { 'targets': [ { - # GN: //components/common/android:bookmarks_java + # GN: //components/bookmarks/common/android:bookmarks_java 'target_name': 'bookmarks_java', 'type': 'none', 'dependencies': [ @@ -138,7 +138,7 @@ 'includes': [ '../build/java.gypi' ], }, { - # GN: //components/common/android:bookmarks_jni_headers + # GN: //components/bookmarks/common/android:bookmarks_jni_headers 'target_name': 'bookmarks_jni_headers', 'type': 'none', 'sources': [ @@ -150,7 +150,7 @@ 'includes': [ '../build/jni_generator.gypi' ], }, { - # GN: //components/common/android:bookmarks_type_javagen + # GN: //components/bookmarks/common/android:bookmarks_type_javagen 'target_name': 'bookmark_type_java', 'type': 'none', 'sources': [ |