| Index: chrome/android/BUILD.gn
|
| diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
| index 0d2c65484e55e8c25ee8050cde19b9f26a5f6095..08ebcfb7c5a13253a4d2b1f15fc02424d013c9ea 100644
|
| --- a/chrome/android/BUILD.gn
|
| +++ b/chrome/android/BUILD.gn
|
| @@ -10,9 +10,7 @@ import("channel.gni")
|
|
|
| # GYP: //chrome/chrome.gyp:chrome_java (resources part)
|
| android_resources("chrome_java_resources") {
|
| - resource_dirs = [
|
| - "java/res",
|
| - ]
|
| + resource_dirs = [ "java/res" ]
|
| deps = [
|
| ":chrome_strings_grd",
|
| "//content/public/android:content_java_resources",
|
| @@ -140,7 +138,7 @@ java_cpp_template("app_banner_metrics_ids_javagen") {
|
| ]
|
| package_name = "org/chromium/chrome/browser/banners"
|
| inputs = [
|
| - "../browser/android/banners/app_banner_metrics_id_list.h"
|
| + "../browser/android/banners/app_banner_metrics_id_list.h",
|
| ]
|
| }
|
|
|
| @@ -151,7 +149,7 @@ java_cpp_template("resource_id_javagen") {
|
| ]
|
| package_name = "org/chromium/chrome/browser"
|
| inputs = [
|
| - "../browser/android/resource_id.h"
|
| + "../browser/android/resource_id.h",
|
| ]
|
| }
|
|
|
| @@ -198,6 +196,7 @@ shared_library("chrome_shell") {
|
| deps = [
|
| ":chrome_shell_base",
|
| ]
|
| +
|
| # GYP: via base/files/protect_file_posix.gypi
|
| # TODO(pasko): Remove this non-trivial linker wrapping as soon as
|
| # crbug.com/424562 is fixed.
|
| @@ -213,9 +212,9 @@ shared_library("chrome_sync_shell") {
|
| sources = [
|
| # This file must always be included in the shared_library step to ensure
|
| # JNI_OnLoad is exported.
|
| -#"//chrome/app/android/chrome_jni_onload.cc",
|
| -#"sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc",
|
| -#"sync_shell/chrome_main_delegate_chrome_sync_shell_android.h",
|
| + #"//chrome/app/android/chrome_jni_onload.cc",
|
| + #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc",
|
| + #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.h",
|
| ]
|
| deps = [
|
| "//sync:test_support_sync_fake_server_android",
|
| @@ -313,13 +312,12 @@ copy_ex("chrome_shell_assets") {
|
| ]
|
|
|
| if (icu_use_data_file) {
|
| - sources += [
|
| - "$root_build_dir/icudtl.dat"
|
| - ]
|
| + sources += [ "$root_build_dir/icudtl.dat" ]
|
| }
|
| }
|
|
|
| -chrome_shell_manifest = "$target_gen_dir/chrome_shell_manifest/AndroidManifest.xml"
|
| +chrome_shell_manifest =
|
| + "$target_gen_dir/chrome_shell_manifest/AndroidManifest.xml"
|
|
|
| # GYP: //chrome/chrome_shell.gypi:chrome_shell_manifest
|
| jinja_template("chrome_shell_manifest") {
|
| @@ -339,22 +337,19 @@ android_apk("chrome_shell_apk") {
|
| ]
|
| apk_name = "ChromeShell"
|
| android_manifest = chrome_shell_manifest
|
| - native_libs = [
|
| - "libchrome_shell.so"
|
| - ]
|
| + native_libs = [ "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',
|
| -#}],
|
| -#],
|
| -#},
|
| -
|
| + #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_shell.gypi:chrome_sync_shell_apk
|
| @@ -368,9 +363,7 @@ android_apk("chrome_sync_shell_apk") {
|
| ]
|
| apk_name = "ChromeSyncShell"
|
| android_manifest = "sync_shell/java/AndroidManifest.xml"
|
| - native_libs = [
|
| - "libchrome_sync_shell.so"
|
| - ]
|
| + native_libs = [ "libchrome_sync_shell.so" ]
|
| asset_location = chrome_shell_assets_dir
|
| }
|
|
|
| @@ -451,7 +444,6 @@ android_apk("chrome_sync_shell_test_apk") {
|
| android_manifest = "sync_shell/javatests/AndroidManifest.xml"
|
| }
|
|
|
| -
|
| # GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests_java
|
| android_library("uiautomator_tests_java") {
|
| testonly = true
|
| @@ -466,7 +458,7 @@ android_library("uiautomator_tests_java") {
|
| uiautomator_test("uiautomator_tests") {
|
| testonly = true
|
| deps = [
|
| - ":uiautomator_tests_java"
|
| + ":uiautomator_tests_java",
|
| ]
|
| }
|
|
|
| @@ -476,11 +468,16 @@ chrome_version_java_file = "$chrome_version_java_dir/org/chromium/chrome/browser
|
| process_version("chrome_version_java") {
|
| source = "java/ChromeVersionConstants.java.version"
|
| output = chrome_version_java_file
|
| - extra_args = ["-e", "CHANNEL=str.upper('$android_channel')"]
|
| + extra_args = [
|
| + "-e",
|
| + "CHANNEL=str.upper('$android_channel')",
|
| + ]
|
| }
|
|
|
| zip("chrome_version_srcjar") {
|
| - inputs = [ chrome_version_java_file ]
|
| + inputs = [
|
| + chrome_version_java_file,
|
| + ]
|
| output = "$target_gen_dir/$target_name.srcjar"
|
| base_dir = chrome_version_java_dir
|
| }
|
|
|