Chromium Code Reviews| 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("//build/module_args/v8.gni") | 7 import("//build/module_args/v8.gni") |
| 8 import("//chrome/version.gni") | 8 import("//chrome/version.gni") |
| 9 import("//third_party/icu/config.gni") | 9 import("//third_party/icu/config.gni") |
| 10 import("channel.gni") | 10 import("channel.gni") |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 352 #'conditions': [ | 352 #'conditions': [ |
| 353 #['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { | 353 #['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', { |
| 354 ## Only enable the chromium linker on regular builds, since the | 354 ## Only enable the chromium linker on regular builds, since the |
| 355 ## component build crashes on Android 4.4. See b/11379966 | 355 ## component build crashes on Android 4.4. See b/11379966 |
| 356 #'use_chromium_linker': '1', | 356 #'use_chromium_linker': '1', |
| 357 #}], | 357 #}], |
| 358 #], | 358 #], |
| 359 #}, | 359 #}, |
| 360 } | 360 } |
| 361 | 361 |
| 362 chrome_sync_shell_manifest = "$target_gen_dir/chrome_sync_shell_manifest/Android Manifest.xml" | 362 chrome_sync_shell_manifest = |
|
tfarina
2014/12/13 15:49:44
I had this in https://codereview.chromium.org/7821
| |
| 363 "$target_gen_dir/chrome_sync_shell_manifest/AndroidManifest.xml" | |
| 363 | 364 |
| 364 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_manifest | 365 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_manifest |
| 365 jinja_template("chrome_sync_shell_manifest") { | 366 jinja_template("chrome_sync_shell_manifest") { |
| 366 testonly = true | 367 testonly = true |
| 367 input = "sync_shell/java/AndroidManifest.xml.jinja2" | 368 input = "sync_shell/java/AndroidManifest.xml.jinja2" |
| 368 output = chrome_sync_shell_manifest | 369 output = chrome_sync_shell_manifest |
| 369 } | 370 } |
| 370 | 371 |
| 371 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk | 372 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk |
| 372 android_apk("chrome_sync_shell_apk") { | 373 android_apk("chrome_sync_shell_apk") { |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 490 ] | 491 ] |
| 491 } | 492 } |
| 492 | 493 |
| 493 zip("chrome_version_srcjar") { | 494 zip("chrome_version_srcjar") { |
| 494 inputs = [ | 495 inputs = [ |
| 495 chrome_version_java_file, | 496 chrome_version_java_file, |
| 496 ] | 497 ] |
| 497 output = "$target_gen_dir/$target_name.srcjar" | 498 output = "$target_gen_dir/$target_name.srcjar" |
| 498 base_dir = chrome_version_java_dir | 499 base_dir = chrome_version_java_dir |
| 499 } | 500 } |
| OLD | NEW |