| Index: chrome/android/BUILD.gn
|
| diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
| index 99ecb1784f2239ee35824824c672f07522f9e5ec..ceef92f12c78cc117f5d266e91e9535e515c0a9e 100644
|
| --- a/chrome/android/BUILD.gn
|
| +++ b/chrome/android/BUILD.gn
|
| @@ -221,245 +221,6 @@ java_cpp_template("resource_id_javagen") {
|
| ]
|
| }
|
|
|
| -# GYP: //chrome/chrome_shell.gypi:libchromeshell_base
|
| -group("chrome_shell_base") {
|
| - deps = [
|
| - "//chrome/browser/ui",
|
| - "//chrome:chrome_android_core",
|
| - "//base",
|
| - "//base/allocator",
|
| - "//content/public/app:both",
|
| - "//skia",
|
| - ]
|
| - # TODO(GYP):
|
| - #[ 'order_profiling!=0', {
|
| - #'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
|
| - #}],
|
| -}
|
| -
|
| -# GYP: //chrome/chrome_shell.gypi:libchromeshell
|
| -shared_library("chrome_shell") {
|
| - testonly = true
|
| - sources = [
|
| - "shell/chrome_main_delegate_chrome_shell_android.cc",
|
| - "shell/chrome_main_delegate_chrome_shell_android.h",
|
| - "shell/chrome_shell_entry_point.cc",
|
| - ]
|
| - deps = [
|
| - ":chrome_shell_base",
|
| - "//build/config/sanitizers:deps",
|
| - ]
|
| -}
|
| -
|
| -# GYP: N/A
|
| -android_resources("chrome_shell_resources") {
|
| - deps = [
|
| - ":chrome_java_resources",
|
| - ]
|
| - testonly = true
|
| - resource_dirs = [ "shell/res" ]
|
| - custom_package = "org.chromium.chrome.shell"
|
| -}
|
| -
|
| -# GYP: N/A
|
| -android_library("chrome_shell_java") {
|
| - testonly = true
|
| - deps = [
|
| - ":chrome_java",
|
| - ":chrome_java_resources",
|
| - ":chrome_shell_resources",
|
| - "//base:base_java",
|
| - "//content/public/android:content_java",
|
| - "//components/dom_distiller/android:dom_distiller_content_java",
|
| - "//components/dom_distiller/android:dom_distiller_core_java",
|
| - "//components/service_tab_launcher:service_tab_launcher_java",
|
| - "//components/web_contents_delegate_android:web_contents_delegate_android_java",
|
| - "//printing:printing_java",
|
| - "//net/android:net_java",
|
| - "//sync/android:sync_java",
|
| - "//third_party/android_tools:android_support_v13_java",
|
| - "//third_party/android_tools:android_support_v7_appcompat_java",
|
| - "//ui/android:ui_java",
|
| - ]
|
| - DEPRECATED_java_in_dir = "shell/java/src"
|
| -}
|
| -
|
| -chrome_shell_assets_dir = "$root_build_dir/chrome_shell/assets"
|
| -
|
| -# GYP: N/A
|
| -copy_ex("chrome_shell_assets") {
|
| - clear_dir = true
|
| - dest = chrome_shell_assets_dir
|
| - sources = [
|
| - "$root_build_dir/chrome_100_percent.pak",
|
| - "$root_build_dir/locales/am.pak",
|
| - "$root_build_dir/locales/ar.pak",
|
| - "$root_build_dir/locales/bg.pak",
|
| - "$root_build_dir/locales/ca.pak",
|
| - "$root_build_dir/locales/cs.pak",
|
| - "$root_build_dir/locales/da.pak",
|
| - "$root_build_dir/locales/de.pak",
|
| - "$root_build_dir/locales/el.pak",
|
| - "$root_build_dir/locales/en-GB.pak",
|
| - "$root_build_dir/locales/en-US.pak",
|
| - "$root_build_dir/locales/es-419.pak",
|
| - "$root_build_dir/locales/es.pak",
|
| - "$root_build_dir/locales/fa.pak",
|
| - "$root_build_dir/locales/fi.pak",
|
| - "$root_build_dir/locales/fil.pak",
|
| - "$root_build_dir/locales/fr.pak",
|
| - "$root_build_dir/locales/he.pak",
|
| - "$root_build_dir/locales/hi.pak",
|
| - "$root_build_dir/locales/hr.pak",
|
| - "$root_build_dir/locales/hu.pak",
|
| - "$root_build_dir/locales/id.pak",
|
| - "$root_build_dir/locales/it.pak",
|
| - "$root_build_dir/locales/ja.pak",
|
| - "$root_build_dir/locales/ko.pak",
|
| - "$root_build_dir/locales/lt.pak",
|
| - "$root_build_dir/locales/lv.pak",
|
| - "$root_build_dir/locales/nb.pak",
|
| - "$root_build_dir/locales/nl.pak",
|
| - "$root_build_dir/locales/pl.pak",
|
| - "$root_build_dir/locales/pt-BR.pak",
|
| - "$root_build_dir/locales/pt-PT.pak",
|
| - "$root_build_dir/locales/ro.pak",
|
| - "$root_build_dir/locales/ru.pak",
|
| - "$root_build_dir/locales/sk.pak",
|
| - "$root_build_dir/locales/sl.pak",
|
| - "$root_build_dir/locales/sr.pak",
|
| - "$root_build_dir/locales/sv.pak",
|
| - "$root_build_dir/locales/sw.pak",
|
| - "$root_build_dir/locales/th.pak",
|
| - "$root_build_dir/locales/tr.pak",
|
| - "$root_build_dir/locales/uk.pak",
|
| - "$root_build_dir/locales/vi.pak",
|
| - "$root_build_dir/locales/zh-CN.pak",
|
| - "$root_build_dir/locales/zh-TW.pak",
|
| - "$root_build_dir/resources.pak",
|
| - ]
|
| - deps = [
|
| - "//chrome:packed_resources",
|
| - "//chrome:packed_extra_resources",
|
| - ]
|
| -
|
| - if (icu_use_data_file) {
|
| - sources += [ "$root_build_dir/icudtl.dat" ]
|
| - deps += [ "//third_party/icu:icudata" ]
|
| - }
|
| - if (v8_use_external_startup_data) {
|
| - sources += [
|
| - "$root_build_dir/natives_blob.bin",
|
| - "$root_build_dir/snapshot_blob.bin",
|
| - ]
|
| - deps += [ "//v8" ]
|
| - }
|
| -}
|
| -
|
| -chrome_shell_manifest =
|
| - "$target_gen_dir/chrome_shell_manifest/AndroidManifest.xml"
|
| -
|
| -# GYP: //chrome/chrome_shell.gypi:chrome_shell_manifest
|
| -jinja_template("chrome_shell_manifest") {
|
| - testonly = true
|
| - input = "shell/java/AndroidManifest.xml.jinja2"
|
| - output = chrome_shell_manifest
|
| -}
|
| -
|
| -# GYP: //chrome/chrome_shell.gypi:chrome_shell_apk
|
| -android_apk("chrome_shell_apk") {
|
| - testonly = true
|
| - deps = [
|
| - ":chrome_shell",
|
| - ":chrome_shell_assets",
|
| - ":chrome_shell_java",
|
| - ":chrome_shell_manifest",
|
| - ":chrome_shell_resources",
|
| - "//base:base_java",
|
| - ]
|
| - apk_name = "ChromeShell"
|
| - android_manifest = chrome_shell_manifest
|
| - native_libs = [ "libchrome_shell.so" ]
|
| - native_lib_version_rule = "//build/util:chrome_version_json"
|
| - _native_lib_file =
|
| - rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
|
| - native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
|
| - 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: part of //chrome/chrome_tests.gypi:chrome_shell_test_apk
|
| -android_library("chrome_javatests") {
|
| - testonly = true
|
| - DEPRECATED_java_in_dir = "javatests_shell/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/impl:java",
|
| - "//components/navigation_interception/android:navigation_interception_java",
|
| - "//content/public/android:content_java",
|
| - "//content/public/test/android:content_java_test_support",
|
| - "//net/android:net_java_test_support",
|
| - "//sync/android:sync_java",
|
| - "//sync:sync_java_test_support",
|
| - "//third_party/android_protobuf:protobuf_nano_javalib",
|
| - "//third_party/android_tools:android_support_v13_java",
|
| - "//third_party/android_tools:android_support_v7_appcompat_java",
|
| - "//third_party/android_tools:legacy_http_javalib",
|
| - "//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",
|
| - "//third_party/android_tools:android_support_v13_java",
|
| - "//third_party/android_tools:android_support_v7_appcompat_java",
|
| - "//ui/android:ui_java",
|
| - ]
|
| - DEPRECATED_java_in_dir = "shell/javatests/src"
|
| -}
|
| -
|
| -# GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk
|
| -instrumentation_test_apk("chrome_shell_test_apk") {
|
| - apk_under_test = ":chrome_shell_apk"
|
| - deps = [
|
| - ":chrome_javatests",
|
| - ":chrome_shell_test_java",
|
| - ]
|
| - apk_name = "ChromeShellTest"
|
| - android_manifest = "shell/javatests/AndroidManifest.xml"
|
| - isolate_file = "../chrome_shell_test_apk.isolate"
|
| -}
|
| -
|
| # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests
|
| junit_binary("chrome_junit_tests") {
|
| java_files = [
|
|
|