| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
| 6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
| 7 import("//chrome/version.gni") | 7 import("//chrome/version.gni") |
| 8 import("//third_party/icu/config.gni") | 8 import("//third_party/icu/config.gni") |
| 9 import("channel.gni") | 9 import("channel.gni") |
| 10 | 10 |
| 11 # GYP: //chrome/chrome.gyp:chrome_java (resources part) | 11 # GYP: //chrome/chrome.gyp:chrome_java (resources part) |
| 12 android_resources("chrome_java_resources") { | 12 android_resources("chrome_java_resources") { |
| 13 resource_dirs = [ | 13 resource_dirs = [ "java/res" ] |
| 14 "java/res", | |
| 15 ] | |
| 16 deps = [ | 14 deps = [ |
| 17 ":chrome_strings_grd", | 15 ":chrome_strings_grd", |
| 18 "//content/public/android:content_java_resources", | 16 "//content/public/android:content_java_resources", |
| 19 "//chrome/app:java_strings_grd", | 17 "//chrome/app:java_strings_grd", |
| 20 "//third_party/android_tools:android_support_v7_appcompat_resources", | 18 "//third_party/android_tools:android_support_v7_appcompat_resources", |
| 21 ] | 19 ] |
| 22 custom_package = "org.chromium.chrome" | 20 custom_package = "org.chromium.chrome" |
| 23 } | 21 } |
| 24 | 22 |
| 25 # GYP: //chrome/chrome.gyp:chrome_strings_grd | 23 # GYP: //chrome/chrome.gyp:chrome_strings_grd |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 ] | 131 ] |
| 134 } | 132 } |
| 135 | 133 |
| 136 # GYP: //chrome/chrome_browser.gypi:app_banner_metrics_ids_java | 134 # GYP: //chrome/chrome_browser.gypi:app_banner_metrics_ids_java |
| 137 java_cpp_template("app_banner_metrics_ids_javagen") { | 135 java_cpp_template("app_banner_metrics_ids_javagen") { |
| 138 sources = [ | 136 sources = [ |
| 139 "java/AppBannerMetricsIds.template", | 137 "java/AppBannerMetricsIds.template", |
| 140 ] | 138 ] |
| 141 package_name = "org/chromium/chrome/browser/banners" | 139 package_name = "org/chromium/chrome/browser/banners" |
| 142 inputs = [ | 140 inputs = [ |
| 143 "../browser/android/banners/app_banner_metrics_id_list.h" | 141 "../browser/android/banners/app_banner_metrics_id_list.h", |
| 144 ] | 142 ] |
| 145 } | 143 } |
| 146 | 144 |
| 147 # GYP: //chrome/chrome_browser.gypi:resource_id_java | 145 # GYP: //chrome/chrome_browser.gypi:resource_id_java |
| 148 java_cpp_template("resource_id_javagen") { | 146 java_cpp_template("resource_id_javagen") { |
| 149 sources = [ | 147 sources = [ |
| 150 "java/ResourceId.template", | 148 "java/ResourceId.template", |
| 151 ] | 149 ] |
| 152 package_name = "org/chromium/chrome/browser" | 150 package_name = "org/chromium/chrome/browser" |
| 153 inputs = [ | 151 inputs = [ |
| 154 "../browser/android/resource_id.h" | 152 "../browser/android/resource_id.h", |
| 155 ] | 153 ] |
| 156 } | 154 } |
| 157 | 155 |
| 158 # GYP: //chrome/chrome_shell.gypi:libchromeshell_base | 156 # GYP: //chrome/chrome_shell.gypi:libchromeshell_base |
| 159 static_library("chrome_shell_base") { | 157 static_library("chrome_shell_base") { |
| 160 sources = [ | 158 sources = [ |
| 161 "shell/chrome_shell_google_location_settings_helper.cc", | 159 "shell/chrome_shell_google_location_settings_helper.cc", |
| 162 "shell/chrome_shell_google_location_settings_helper.h", | 160 "shell/chrome_shell_google_location_settings_helper.h", |
| 163 ] | 161 ] |
| 164 | 162 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 191 sources = [ | 189 sources = [ |
| 192 # This file must always be included in the shared_library step to ensure | 190 # This file must always be included in the shared_library step to ensure |
| 193 # JNI_OnLoad is exported. | 191 # JNI_OnLoad is exported. |
| 194 "//chrome/app/android/chrome_jni_onload.cc", | 192 "//chrome/app/android/chrome_jni_onload.cc", |
| 195 "shell/chrome_main_delegate_chrome_shell_android.cc", | 193 "shell/chrome_main_delegate_chrome_shell_android.cc", |
| 196 "shell/chrome_main_delegate_chrome_shell_android.h", | 194 "shell/chrome_main_delegate_chrome_shell_android.h", |
| 197 ] | 195 ] |
| 198 deps = [ | 196 deps = [ |
| 199 ":chrome_shell_base", | 197 ":chrome_shell_base", |
| 200 ] | 198 ] |
| 199 |
| 201 # GYP: via base/files/protect_file_posix.gypi | 200 # GYP: via base/files/protect_file_posix.gypi |
| 202 # TODO(pasko): Remove this non-trivial linker wrapping as soon as | 201 # TODO(pasko): Remove this non-trivial linker wrapping as soon as |
| 203 # crbug.com/424562 is fixed. | 202 # crbug.com/424562 is fixed. |
| 204 if (!is_component_build) { | 203 if (!is_component_build) { |
| 205 ldflags = [ "-Wl,--wrap=close" ] | 204 ldflags = [ "-Wl,--wrap=close" ] |
| 206 deps += [ "//base:protect_file_posix" ] | 205 deps += [ "//base:protect_file_posix" ] |
| 207 } | 206 } |
| 208 } | 207 } |
| 209 | 208 |
| 210 # GYP: //chrome/chrome_shell.gypi:libchromesyncshell | 209 # GYP: //chrome/chrome_shell.gypi:libchromesyncshell |
| 211 shared_library("chrome_sync_shell") { | 210 shared_library("chrome_sync_shell") { |
| 212 testonly = true | 211 testonly = true |
| 213 sources = [ | 212 sources = [ |
| 214 # This file must always be included in the shared_library step to ensure | 213 # This file must always be included in the shared_library step to ensure |
| 215 # JNI_OnLoad is exported. | 214 # JNI_OnLoad is exported. |
| 216 #"//chrome/app/android/chrome_jni_onload.cc", | 215 #"//chrome/app/android/chrome_jni_onload.cc", |
| 217 #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc", | 216 #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc", |
| 218 #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.h", | 217 #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.h", |
| 219 ] | 218 ] |
| 220 deps = [ | 219 deps = [ |
| 221 "//sync:test_support_sync_fake_server_android", | 220 "//sync:test_support_sync_fake_server_android", |
| 222 ] | 221 ] |
| 223 datadeps = [ | 222 datadeps = [ |
| 224 ":chrome_shell_base", | 223 ":chrome_shell_base", |
| 225 ] | 224 ] |
| 226 } | 225 } |
| 227 | 226 |
| 228 # GYP: N/A | 227 # GYP: N/A |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 "$root_build_dir/locales/vi.pak", | 305 "$root_build_dir/locales/vi.pak", |
| 307 "$root_build_dir/locales/zh-CN.pak", | 306 "$root_build_dir/locales/zh-CN.pak", |
| 308 "$root_build_dir/locales/zh-TW.pak", | 307 "$root_build_dir/locales/zh-TW.pak", |
| 309 ] | 308 ] |
| 310 deps = [ | 309 deps = [ |
| 311 "//chrome:packed_resources", | 310 "//chrome:packed_resources", |
| 312 "//chrome:packed_extra_resources", | 311 "//chrome:packed_extra_resources", |
| 313 ] | 312 ] |
| 314 | 313 |
| 315 if (icu_use_data_file) { | 314 if (icu_use_data_file) { |
| 316 sources += [ | 315 sources += [ "$root_build_dir/icudtl.dat" ] |
| 317 "$root_build_dir/icudtl.dat" | |
| 318 ] | |
| 319 } | 316 } |
| 320 } | 317 } |
| 321 | 318 |
| 322 chrome_shell_manifest = "$target_gen_dir/chrome_shell_manifest/AndroidManifest.x
ml" | 319 chrome_shell_manifest = |
| 320 "$target_gen_dir/chrome_shell_manifest/AndroidManifest.xml" |
| 323 | 321 |
| 324 # GYP: //chrome/chrome_shell.gypi:chrome_shell_manifest | 322 # GYP: //chrome/chrome_shell.gypi:chrome_shell_manifest |
| 325 jinja_template("chrome_shell_manifest") { | 323 jinja_template("chrome_shell_manifest") { |
| 326 testonly = true | 324 testonly = true |
| 327 input = "shell/java/AndroidManifest.xml" | 325 input = "shell/java/AndroidManifest.xml" |
| 328 output = chrome_shell_manifest | 326 output = chrome_shell_manifest |
| 329 } | 327 } |
| 330 | 328 |
| 331 # GYP: //chrome/chrome_shell.gypi:chrome_shell_apk | 329 # GYP: //chrome/chrome_shell.gypi:chrome_shell_apk |
| 332 android_apk("chrome_shell_apk") { | 330 android_apk("chrome_shell_apk") { |
| 333 testonly = true | 331 testonly = true |
| 334 deps = [ | 332 deps = [ |
| 335 ":chrome_shell_resources", | 333 ":chrome_shell_resources", |
| 336 ":chrome_shell_java", | 334 ":chrome_shell_java", |
| 337 ":chrome_shell_assets", | 335 ":chrome_shell_assets", |
| 338 ":chrome_shell", | 336 ":chrome_shell", |
| 339 ] | 337 ] |
| 340 apk_name = "ChromeShell" | 338 apk_name = "ChromeShell" |
| 341 android_manifest = chrome_shell_manifest | 339 android_manifest = chrome_shell_manifest |
| 342 native_libs = [ | 340 native_libs = [ "libchrome_shell.so" ] |
| 343 "libchrome_shell.so" | |
| 344 ] | |
| 345 asset_location = chrome_shell_assets_dir | 341 asset_location = chrome_shell_assets_dir |
| 346 | 342 |
| 347 #TODO(GYP): | 343 #TODO(GYP): |
| 348 #'variables': { | 344 #'variables': { |
| 349 #'conditions': [ | 345 #'conditions': [ |
| 350 #['component != "shared_library" and target_arch != "arm64" and target_arch != "
x64" and profiling_full_stack_frames != 1', { | 346 #['component != "shared_library" and target_arch != "arm64" and target_arch !=
"x64" and profiling_full_stack_frames != 1', { |
| 351 ## Only enable the chromium linker on regular builds, since the | 347 ## Only enable the chromium linker on regular builds, since the |
| 352 ## component build crashes on Android 4.4. See b/11379966 | 348 ## component build crashes on Android 4.4. See b/11379966 |
| 353 #'use_chromium_linker': '1', | 349 #'use_chromium_linker': '1', |
| 354 #}], | 350 #}], |
| 355 #], | 351 #], |
| 356 #}, | 352 #}, |
| 357 | |
| 358 } | 353 } |
| 359 | 354 |
| 360 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk | 355 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk |
| 361 android_apk("chrome_sync_shell_apk") { | 356 android_apk("chrome_sync_shell_apk") { |
| 362 testonly = true | 357 testonly = true |
| 363 deps = [ | 358 deps = [ |
| 364 ":chrome_shell_resources", | 359 ":chrome_shell_resources", |
| 365 ":chrome_shell_java", | 360 ":chrome_shell_java", |
| 366 ":chrome_shell_assets", | 361 ":chrome_shell_assets", |
| 367 ":chrome_sync_shell", | 362 ":chrome_sync_shell", |
| 368 ] | 363 ] |
| 369 apk_name = "ChromeSyncShell" | 364 apk_name = "ChromeSyncShell" |
| 370 android_manifest = "sync_shell/java/AndroidManifest.xml" | 365 android_manifest = "sync_shell/java/AndroidManifest.xml" |
| 371 native_libs = [ | 366 native_libs = [ "libchrome_sync_shell.so" ] |
| 372 "libchrome_sync_shell.so" | |
| 373 ] | |
| 374 asset_location = chrome_shell_assets_dir | 367 asset_location = chrome_shell_assets_dir |
| 375 } | 368 } |
| 376 | 369 |
| 377 # GYP: part of //chrome/chrome_tests.gypi:chrome_shell_test_apk | 370 # GYP: part of //chrome/chrome_tests.gypi:chrome_shell_test_apk |
| 378 android_library("chrome_javatests") { | 371 android_library("chrome_javatests") { |
| 379 testonly = true | 372 testonly = true |
| 380 DEPRECATED_java_in_dir = "javatests/src" | 373 DEPRECATED_java_in_dir = "javatests/src" |
| 381 deps = [ | 374 deps = [ |
| 382 ":chrome_java", | 375 ":chrome_java", |
| 383 ":chrome_java_resources", | 376 ":chrome_java_resources", |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 444 "//content/public/android:content_java", | 437 "//content/public/android:content_java", |
| 445 "//content/public/test/android:content_java_test_support", | 438 "//content/public/test/android:content_java_test_support", |
| 446 "//sync/android:sync_java", | 439 "//sync/android:sync_java", |
| 447 "//sync:sync_java_test_support", | 440 "//sync:sync_java_test_support", |
| 448 ] | 441 ] |
| 449 apk_name = "ChromeSyncShellTest" | 442 apk_name = "ChromeSyncShellTest" |
| 450 DEPRECATED_java_in_dir = "sync_shell/javatests/src" | 443 DEPRECATED_java_in_dir = "sync_shell/javatests/src" |
| 451 android_manifest = "sync_shell/javatests/AndroidManifest.xml" | 444 android_manifest = "sync_shell/javatests/AndroidManifest.xml" |
| 452 } | 445 } |
| 453 | 446 |
| 454 | |
| 455 # GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests_java | 447 # GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests_java |
| 456 android_library("uiautomator_tests_java") { | 448 android_library("uiautomator_tests_java") { |
| 457 testonly = true | 449 testonly = true |
| 458 DEPRECATED_java_in_dir = "uiautomator_tests/src" | 450 DEPRECATED_java_in_dir = "uiautomator_tests/src" |
| 459 deps = [ | 451 deps = [ |
| 460 "//base:base_java_test_support", | 452 "//base:base_java_test_support", |
| 461 "//third_party/android_tools:uiautomator_java", | 453 "//third_party/android_tools:uiautomator_java", |
| 462 ] | 454 ] |
| 463 } | 455 } |
| 464 | 456 |
| 465 # GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests | 457 # GYP: //chrome/chrome_tests.gypi:chrome_shell_uiautomator_tests |
| 466 uiautomator_test("uiautomator_tests") { | 458 uiautomator_test("uiautomator_tests") { |
| 467 testonly = true | 459 testonly = true |
| 468 deps = [ | 460 deps = [ |
| 469 ":uiautomator_tests_java" | 461 ":uiautomator_tests_java", |
| 470 ] | 462 ] |
| 471 } | 463 } |
| 472 | 464 |
| 473 # GYP: //chrome/chrome_android.gypi:chrome_version_java | 465 # GYP: //chrome/chrome_android.gypi:chrome_version_java |
| 474 chrome_version_java_dir = "$root_gen_dir/templates/chrome_version_java" | 466 chrome_version_java_dir = "$root_gen_dir/templates/chrome_version_java" |
| 475 chrome_version_java_file = "$chrome_version_java_dir/org/chromium/chrome/browser
/ChromeVersionConstants.java" | 467 chrome_version_java_file = "$chrome_version_java_dir/org/chromium/chrome/browser
/ChromeVersionConstants.java" |
| 476 process_version("chrome_version_java") { | 468 process_version("chrome_version_java") { |
| 477 source = "java/ChromeVersionConstants.java.version" | 469 source = "java/ChromeVersionConstants.java.version" |
| 478 output = chrome_version_java_file | 470 output = chrome_version_java_file |
| 479 extra_args = ["-e", "CHANNEL=str.upper('$android_channel')"] | 471 extra_args = [ |
| 472 "-e", |
| 473 "CHANNEL=str.upper('$android_channel')", |
| 474 ] |
| 480 } | 475 } |
| 481 | 476 |
| 482 zip("chrome_version_srcjar") { | 477 zip("chrome_version_srcjar") { |
| 483 inputs = [ chrome_version_java_file ] | 478 inputs = [ |
| 479 chrome_version_java_file, |
| 480 ] |
| 484 output = "$target_gen_dir/$target_name.srcjar" | 481 output = "$target_gen_dir/$target_name.srcjar" |
| 485 base_dir = chrome_version_java_dir | 482 base_dir = chrome_version_java_dir |
| 486 } | 483 } |
| OLD | NEW |