| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 'package_name': 'chrome_shell_apk', | 7 'package_name': 'chrome_shell_apk', |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 'chrome_android_paks.gypi', # Included for the list of pak resources. | 10 'chrome_android_paks.gypi', # Included for the list of pak resources. |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 'manifest_package_name': 'org.chromium.chrome.shell', | 66 'manifest_package_name': 'org.chromium.chrome.shell', |
| 67 'java_in_dir': 'android/shell/java', | 67 'java_in_dir': 'android/shell/java', |
| 68 'resource_dir': 'android/shell/res', | 68 'resource_dir': 'android/shell/res', |
| 69 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', | 69 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', |
| 70 'native_lib_target': 'libchromeshell', | 70 'native_lib_target': 'libchromeshell', |
| 71 'native_lib_version_name': '<(version_full)', | 71 'native_lib_version_name': '<(version_full)', |
| 72 'additional_input_paths': [ | 72 'additional_input_paths': [ |
| 73 '<@(chrome_android_pak_output_resources)', | 73 '<@(chrome_android_pak_output_resources)', |
| 74 ], | 74 ], |
| 75 'conditions': [ | 75 'conditions': [ |
| 76 ['component != "shared_library" and target_arch != "arm64" and target_
arch != "x64"', { | 76 ['component != "shared_library" and target_arch != "arm64" and target_
arch != "x64" and profiling_full_stack_frames != 1', { |
| 77 # Only enable the chromium linker on regular builds, since the | 77 # Only enable the chromium linker on regular builds, since the |
| 78 # component build crashes on Android 4.4. See b/11379966 | 78 # component build crashes on Android 4.4. See b/11379966 |
| 79 'use_chromium_linker': '1', | 79 'use_chromium_linker': '1', |
| 80 }], | 80 }], |
| 81 ], | 81 ], |
| 82 }, | 82 }, |
| 83 'includes': [ '../build/java_apk.gypi', ], | 83 'includes': [ '../build/java_apk.gypi', ], |
| 84 }, | 84 }, |
| 85 { | 85 { |
| 86 # chrome_shell_apk creates a .jar as a side effect. Any java targets | 86 # chrome_shell_apk creates a .jar as a side effect. Any java targets |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 { | 141 { |
| 142 'destination': '<(chrome_android_pak_output_folder)', | 142 'destination': '<(chrome_android_pak_output_folder)', |
| 143 'files': [ | 143 'files': [ |
| 144 '<@(chrome_android_pak_input_resources)', | 144 '<@(chrome_android_pak_input_resources)', |
| 145 ], | 145 ], |
| 146 } | 146 } |
| 147 ], | 147 ], |
| 148 }, | 148 }, |
| 149 ], | 149 ], |
| 150 } | 150 } |
| OLD | NEW |