| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 'includes': [ | 5 'includes': [ |
| 6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso
urces. | 6 '../../chrome/chrome_android_paks.gypi', # Included for the list of pak reso
urces. |
| 7 '../../build/util/version.gypi' | 7 '../../build/util/version.gypi' |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'chromium_code': 1, | 10 'chromium_code': 1, |
| 11 'package_name': 'chrome_public_apk', | 11 'package_name': 'chrome_public_apk', |
| 12 'manifest_package': 'org.chromium.chrome', | 12 'manifest_package': 'org.chromium.chrome', |
| 13 'sync_shell_manifest_package': 'org.chromium.chrome.sync_shell', | 13 'sync_shell_manifest_package': 'org.chromium.chrome.sync_shell', |
| 14 'chrome_public_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public_apk_
manifest/AndroidManifest.xml', | 14 'chrome_public_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public_apk_
manifest/AndroidManifest.xml', |
| 15 'chrome_public_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public
_test_apk_manifest/AndroidManifest.xml', | 15 'chrome_public_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_public
_test_apk_manifest/AndroidManifest.xml', |
| 16 'chrome_sync_shell_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_sh
ell_apk_manifest/AndroidManifest.xml', | 16 'chrome_sync_shell_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_sync_sh
ell_apk_manifest/AndroidManifest.xml', |
| 17 'chrome_sync_shell_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_sy
nc_shell_test_apk_manifest/AndroidManifest.xml', | 17 'chrome_sync_shell_test_apk_manifest': '<(SHARED_INTERMEDIATE_DIR)/chrome_sy
nc_shell_test_apk_manifest/AndroidManifest.xml', |
| 18 # This list is shared with GN. | 18 # This list is shared with GN. |
| 19 # Defines a list of source files should be present in the open-source | 19 # Defines a list of source files should be present in the open-source |
| 20 # chrome-apk but not in the published static_library which is included in th
e | 20 # chrome-apk but not in the published static_library which is included in th
e |
| 21 # real chrome for android. | 21 # real chrome for android. |
| 22 'chrome_public_app_native_sources': [ | 22 'chrome_public_app_native_sources': [ |
| 23 '../app/android/chrome_main_delegate_android_initializer.cc', | 23 '../app/android/chrome_main_delegate_android_initializer.cc', |
| 24 '../browser/android/chrome_entry_point.cc', | 24 '../browser/android/chrome_entry_point.cc', |
| 25 ], | 25 ], |
| 26 |
| 27 # This list is shared with GN. |
| 28 'chrome_sync_shell_app_native_sources': [ |
| 29 '../browser/android/chrome_entry_point.cc', |
| 30 '../browser/android/chrome_sync_shell_main_delegate_initializer.cc', |
| 31 '../browser/android/chrome_sync_shell_main_delegate.h', |
| 32 '../browser/android/chrome_sync_shell_main_delegate.cc', |
| 33 ] |
| 26 }, | 34 }, |
| 27 'targets': [ | 35 'targets': [ |
| 28 { | 36 { |
| 29 #GN: //chrome/android::custom_tabs_service_aidl | 37 # GN: //chrome/android::custom_tabs_service_aidl |
| 30 'target_name': 'custom_tabs_service_aidl', | 38 'target_name': 'custom_tabs_service_aidl', |
| 31 'type': 'none', | 39 'type': 'none', |
| 32 'variables': { | 40 'variables': { |
| 33 'aidl_interface_file': 'java/src/android/support/customtabs/common.aidl'
, | 41 'aidl_interface_file': 'java/src/android/support/customtabs/common.aidl'
, |
| 34 'aidl_import_include': 'java/src/android/support/customtabs', | 42 'aidl_import_include': 'java/src/android/support/customtabs', |
| 35 }, | 43 }, |
| 36 'sources': [ | 44 'sources': [ |
| 37 'java/src/android/support/customtabs/ICustomTabsCallback.aidl', | 45 'java/src/android/support/customtabs/ICustomTabsCallback.aidl', |
| 38 'java/src/android/support/customtabs/ICustomTabsService.aidl', | 46 'java/src/android/support/customtabs/ICustomTabsService.aidl', |
| 39 ], | 47 ], |
| 40 'includes': [ '../../build/java_aidl.gypi' ], | 48 'includes': [ '../../build/java_aidl.gypi' ], |
| 41 }, | 49 }, |
| 42 { | 50 { |
| 43 # GN: //chrome/android:chrome_public_template_resources | 51 # GN: //chrome/android:chrome_public_apk_template_resources |
| 44 'target_name': 'chrome_public_template_resources', | 52 'target_name': 'chrome_public_apk_template_resources', |
| 45 'type': 'none', | 53 'type': 'none', |
| 46 'variables': { | 54 'variables': { |
| 47 'jinja_inputs_base_dir': 'java/res_template', | 55 'jinja_inputs_base_dir': 'java/res_template', |
| 48 'jinja_inputs': [ | 56 'jinja_inputs': [ |
| 49 '<(jinja_inputs_base_dir)/xml/searchable.xml', | 57 '<(jinja_inputs_base_dir)/xml/searchable.xml', |
| 50 '<(jinja_inputs_base_dir)/xml/syncadapter.xml', | 58 '<(jinja_inputs_base_dir)/xml/syncadapter.xml', |
| 51 ], | 59 ], |
| 52 'jinja_outputs_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip', | 60 'jinja_outputs_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip', |
| 53 'jinja_variables': [ | 61 'jinja_variables': [ |
| 54 'manifest_package=<(manifest_package)', | 62 'manifest_package=<(manifest_package)', |
| 55 ], | 63 ], |
| 56 }, | 64 }, |
| 57 'all_dependent_settings': { | 65 'all_dependent_settings': { |
| 58 'variables': { | 66 'variables': { |
| 59 'additional_input_paths': ['<(jinja_outputs_zip)'], | 67 'additional_input_paths': ['<(jinja_outputs_zip)'], |
| 60 'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'], | 68 'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'], |
| 61 }, | 69 }, |
| 62 }, | 70 }, |
| 63 'includes': [ '../../build/android/jinja_template.gypi' ], | 71 'includes': [ '../../build/android/jinja_template.gypi' ], |
| 64 }, | 72 }, |
| 65 { | 73 { |
| 66 # TODO(pvalenzuela): Implement this target with GN: | 74 # GN: //chrome/android:chrome_sync_shell_apk_template_resources |
| 67 # http://crbug.com/475612 | 75 'target_name': 'chrome_sync_shell_apk_template_resources', |
| 68 'target_name': 'chrome_sync_shell_template_resources', | |
| 69 'type': 'none', | 76 'type': 'none', |
| 70 'variables': { | 77 'variables': { |
| 71 'jinja_inputs_base_dir': 'java/res_template', | 78 'jinja_inputs_base_dir': 'java/res_template', |
| 72 'jinja_inputs': [ | 79 'jinja_inputs': [ |
| 73 '<(jinja_inputs_base_dir)/xml/searchable.xml', | 80 '<(jinja_inputs_base_dir)/xml/searchable.xml', |
| 74 '<(jinja_inputs_base_dir)/xml/syncadapter.xml', | 81 '<(jinja_inputs_base_dir)/xml/syncadapter.xml', |
| 75 ], | 82 ], |
| 76 'jinja_outputs_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip', | 83 'jinja_outputs_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip', |
| 77 'jinja_variables': [ | 84 'jinja_variables': [ |
| 78 'manifest_package=<(sync_shell_manifest_package)', | 85 'manifest_package=<(sync_shell_manifest_package)', |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 'target_name': 'libchrome_public', | 139 'target_name': 'libchrome_public', |
| 133 'type': 'shared_library', | 140 'type': 'shared_library', |
| 134 'sources': [ | 141 'sources': [ |
| 135 '<@(chrome_public_app_native_sources)', | 142 '<@(chrome_public_app_native_sources)', |
| 136 ], | 143 ], |
| 137 'dependencies': [ | 144 'dependencies': [ |
| 138 'libchrome_public_base', | 145 'libchrome_public_base', |
| 139 ], | 146 ], |
| 140 }, | 147 }, |
| 141 { | 148 { |
| 142 # TODO(pvalenzuela): Implement this target with GN: | 149 # GN: //chrome/android:chrome_sync_shell |
| 143 # http://crbug.com/475612 | |
| 144 'target_name': 'libchrome_sync_shell', | 150 'target_name': 'libchrome_sync_shell', |
| 145 'type': 'shared_library', | 151 'type': 'shared_library', |
| 146 'sources': [ | 152 'sources': [ |
| 147 '../browser/android/chrome_entry_point.cc', | 153 '<@(chrome_sync_shell_app_native_sources)', |
| 148 '../browser/android/chrome_sync_shell_main_delegate_initializer.cc', | |
| 149 '../browser/android/chrome_sync_shell_main_delegate.h', | |
| 150 '../browser/android/chrome_sync_shell_main_delegate.cc', | |
| 151 ], | 154 ], |
| 152 'dependencies': [ | 155 'dependencies': [ |
| 153 'libchrome_public_base', | 156 'libchrome_public_base', |
| 154 '../../sync/sync.gyp:sync', | 157 '../../sync/sync.gyp:sync', |
| 155 '../../sync/sync.gyp:test_support_sync_fake_server_android', | 158 '../../sync/sync.gyp:test_support_sync_fake_server_android', |
| 156 ], | 159 ], |
| 157 }, | 160 }, |
| 158 { | 161 { |
| 159 # GN: //chrome/android:chrome_public_apk_manifest | 162 # GN: //chrome/android:chrome_public_apk_manifest |
| 160 'target_name': 'chrome_public_manifest', | 163 'target_name': 'chrome_public_manifest', |
| 161 'type': 'none', | 164 'type': 'none', |
| 162 'variables': { | 165 'variables': { |
| 163 'jinja_inputs': ['java/AndroidManifest.xml'], | 166 'jinja_inputs': ['java/AndroidManifest.xml'], |
| 164 'jinja_output': '<(chrome_public_apk_manifest)', | 167 'jinja_output': '<(chrome_public_apk_manifest)', |
| 165 'jinja_variables': [ | 168 'jinja_variables': [ |
| 166 'channel=<(android_channel)', | 169 'channel=<(android_channel)', |
| 167 'configuration_policy=<(configuration_policy)', | 170 'configuration_policy=<(configuration_policy)', |
| 168 'manifest_package=<(manifest_package)', | 171 'manifest_package=<(manifest_package)', |
| 169 'min_sdk_version=16', | 172 'min_sdk_version=16', |
| 170 'target_sdk_version=23', | 173 'target_sdk_version=23', |
| 171 ], | 174 ], |
| 172 }, | 175 }, |
| 173 'includes': [ '../../build/android/jinja_template.gypi' ], | 176 'includes': [ '../../build/android/jinja_template.gypi' ], |
| 174 }, | 177 }, |
| 175 { | 178 { |
| 176 # TODO(pvalenzuela): Implement this target with GN: | 179 # GN: //chrome/android:chrome_sync_shell_apk_manifest |
| 177 # http://crbug.com/475612 | 180 'target_name': 'chrome_sync_shell_apk_manifest', |
| 178 'target_name': 'chrome_sync_shell_manifest', | |
| 179 'type': 'none', | 181 'type': 'none', |
| 180 'variables': { | 182 'variables': { |
| 181 'jinja_inputs': ['java/AndroidManifest.xml'], | 183 'jinja_inputs': ['java/AndroidManifest.xml'], |
| 182 'jinja_output': '<(chrome_sync_shell_apk_manifest)', | 184 'jinja_output': '<(chrome_sync_shell_apk_manifest)', |
| 183 'jinja_variables': [ | 185 'jinja_variables': [ |
| 184 'channel=<(android_channel)', | 186 'channel=<(android_channel)', |
| 185 'configuration_policy=<(configuration_policy)', | 187 'configuration_policy=<(configuration_policy)', |
| 186 'manifest_package=<(sync_shell_manifest_package)', | 188 'manifest_package=<(sync_shell_manifest_package)', |
| 187 'min_sdk_version=16', | 189 'min_sdk_version=16', |
| 188 'target_sdk_version=22', | 190 'target_sdk_version=22', |
| (...skipping 17 matching lines...) Expand all Loading... |
| 206 # Only attempt loading the library from the APK for 64 bit devices | 208 # Only attempt loading the library from the APK for 64 bit devices |
| 207 # until the number of 32 bit devices which don't support this | 209 # until the number of 32 bit devices which don't support this |
| 208 # approach falls to a minimal level - http://crbug.com/390618. | 210 # approach falls to a minimal level - http://crbug.com/390618. |
| 209 ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch
== "arm64" or target_arch == "x86_64")', { | 211 ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch
== "arm64" or target_arch == "x86_64")', { |
| 210 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', | 212 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', |
| 211 }], | 213 }], |
| 212 ], | 214 ], |
| 213 }, | 215 }, |
| 214 'dependencies': [ | 216 'dependencies': [ |
| 215 'chrome_android_paks_copy', | 217 'chrome_android_paks_copy', |
| 216 'chrome_public_template_resources', | 218 'chrome_public_apk_template_resources', |
| 217 'libchrome_public', | 219 'libchrome_public', |
| 218 '../chrome.gyp:chrome_java', | 220 '../chrome.gyp:chrome_java', |
| 219 ], | 221 ], |
| 220 'includes': [ 'chrome_apk.gypi' ], | 222 'includes': [ 'chrome_apk.gypi' ], |
| 221 }, | 223 }, |
| 222 { | 224 { |
| 223 # GN: N/A | 225 # GN: N/A |
| 224 # chrome_public_apk creates a .jar as a side effect. Any java targets | 226 # chrome_public_apk creates a .jar as a side effect. Any java targets |
| 225 # that need that .jar in their classpath should depend on this target, | 227 # that need that .jar in their classpath should depend on this target, |
| 226 'target_name': 'chrome_public_apk_java', | 228 'target_name': 'chrome_public_apk_java', |
| 227 'type': 'none', | 229 'type': 'none', |
| 228 'dependencies': [ | 230 'dependencies': [ |
| 229 'chrome_public_apk', | 231 'chrome_public_apk', |
| 230 ], | 232 ], |
| 231 'includes': [ '../../build/apk_fake_jar.gypi' ], | 233 'includes': [ '../../build/apk_fake_jar.gypi' ], |
| 232 }, | 234 }, |
| 233 { | 235 { |
| 234 # TODO(pvalenzuela): Implement this target with GN: | 236 # GN: //chrome/android:chrome_sync_shell_apk |
| 235 # http://crbug.com/475612 | |
| 236 'target_name': 'chrome_sync_shell_apk', | 237 'target_name': 'chrome_sync_shell_apk', |
| 237 'type': 'none', | 238 'type': 'none', |
| 238 'variables': { | 239 'variables': { |
| 239 'android_manifest_path': '<(chrome_sync_shell_apk_manifest)', | 240 'android_manifest_path': '<(chrome_sync_shell_apk_manifest)', |
| 240 'apk_name': 'ChromeSyncShell', | 241 'apk_name': 'ChromeSyncShell', |
| 241 'native_lib_target': 'libchrome_sync_shell', | 242 'native_lib_target': 'libchrome_sync_shell', |
| 242 'java_in_dir': 'java', | 243 'java_in_dir': 'java', |
| 243 'enable_multidex': 1, | 244 'enable_multidex': 1, |
| 244 'enable_multidex_configurations': ['Debug'], | 245 'enable_multidex_configurations': ['Debug'], |
| 245 'conditions': [ | 246 'conditions': [ |
| 246 # Only attempt loading the library from the APK for 64 bit devices | 247 # Only attempt loading the library from the APK for 64 bit devices |
| 247 # until the number of 32 bit devices which don't support this | 248 # until the number of 32 bit devices which don't support this |
| 248 # approach falls to a minimal level - http://crbug.com/390618. | 249 # approach falls to a minimal level - http://crbug.com/390618. |
| 249 ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch
== "arm64" or target_arch == "x86_64")', { | 250 ['chrome_apk_use_chromium_linker==1 and profiling==0 and (target_arch
== "arm64" or target_arch == "x86_64")', { |
| 250 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', | 251 'load_library_from_zip': '<(chrome_apk_load_library_from_zip)', |
| 251 }], | 252 }], |
| 252 ], | 253 ], |
| 253 }, | 254 }, |
| 254 'dependencies': [ | 255 'dependencies': [ |
| 255 'chrome_android_paks_copy', | 256 'chrome_android_paks_copy', |
| 256 'chrome_sync_shell_template_resources', | 257 'chrome_sync_shell_apk_template_resources', |
| 257 'libchrome_sync_shell', | 258 'libchrome_sync_shell', |
| 258 '../chrome.gyp:chrome_java', | 259 '../chrome.gyp:chrome_java', |
| 259 # This exists here because com.google.protobuf.nano is needed in tests, | 260 # This exists here because com.google.protobuf.nano is needed in tests, |
| 260 # but that code is stripped out via proguard. Adding this deps adds | 261 # but that code is stripped out via proguard. Adding this deps adds |
| 261 # usages and prevents removal of the proto code. | 262 # usages and prevents removal of the proto code. |
| 262 '../../sync/sync.gyp:test_support_sync_proto_java', | 263 '../../sync/sync.gyp:test_support_sync_proto_java', |
| 263 ], | 264 ], |
| 264 'includes': [ 'chrome_apk.gypi' ], | 265 'includes': [ 'chrome_apk.gypi' ], |
| 265 }, | 266 }, |
| 266 { | 267 { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 'variables': { | 310 'variables': { |
| 310 'jinja_inputs': ['javatests/AndroidManifest.xml'], | 311 'jinja_inputs': ['javatests/AndroidManifest.xml'], |
| 311 'jinja_output': '<(chrome_public_test_apk_manifest)', | 312 'jinja_output': '<(chrome_public_test_apk_manifest)', |
| 312 'jinja_variables': [ | 313 'jinja_variables': [ |
| 313 'manifest_package=<(manifest_package)', | 314 'manifest_package=<(manifest_package)', |
| 314 ], | 315 ], |
| 315 }, | 316 }, |
| 316 'includes': [ '../../build/android/jinja_template.gypi' ], | 317 'includes': [ '../../build/android/jinja_template.gypi' ], |
| 317 }, | 318 }, |
| 318 { | 319 { |
| 319 # TODO(pvalenzuela): Implement this target with GN: | 320 # GN: //chrome/android:chrome_sync_shell_test_apk_manifest |
| 320 # http://crbug.com/475612 | |
| 321 'target_name': 'chrome_sync_shell_test_apk_manifest', | 321 'target_name': 'chrome_sync_shell_test_apk_manifest', |
| 322 'type': 'none', | 322 'type': 'none', |
| 323 'variables': { | 323 'variables': { |
| 324 'jinja_inputs': ['sync_shell/javatests/AndroidManifest.xml'], | 324 'jinja_inputs': ['sync_shell/javatests/AndroidManifest.xml'], |
| 325 'jinja_output': '<(chrome_sync_shell_test_apk_manifest)', | 325 'jinja_output': '<(chrome_sync_shell_test_apk_manifest)', |
| 326 'jinja_variables': [ | 326 'jinja_variables': [ |
| 327 'manifest_package=<(sync_shell_manifest_package)', | 327 'manifest_package=<(sync_shell_manifest_package)', |
| 328 ], | 328 ], |
| 329 }, | 329 }, |
| 330 'includes': [ '../../build/android/jinja_template.gypi' ], | 330 'includes': [ '../../build/android/jinja_template.gypi' ], |
| (...skipping 17 matching lines...) Expand all Loading... |
| 348 'is_test_apk': 1, | 348 'is_test_apk': 1, |
| 349 'test_type': 'instrumentation', | 349 'test_type': 'instrumentation', |
| 350 'isolate_file': '../chrome_public_test_apk.isolate', | 350 'isolate_file': '../chrome_public_test_apk.isolate', |
| 351 }, | 351 }, |
| 352 'includes': [ | 352 'includes': [ |
| 353 '../../build/java_apk.gypi', | 353 '../../build/java_apk.gypi', |
| 354 '../../build/android/test_runner.gypi', | 354 '../../build/android/test_runner.gypi', |
| 355 ], | 355 ], |
| 356 }, | 356 }, |
| 357 { | 357 { |
| 358 # TODO(pvalenzuela): Implement this target with GN: | 358 # GN: //chrome/android:chrome_sync_shell_test_apk |
| 359 # http://crbug.com/475612 | |
| 360 'target_name': 'chrome_sync_shell_test_apk', | 359 'target_name': 'chrome_sync_shell_test_apk', |
| 361 'type': 'none', | 360 'type': 'none', |
| 362 'dependencies': [ | 361 'dependencies': [ |
| 363 'chrome_sync_shell_apk_java', | 362 'chrome_sync_shell_apk_java', |
| 364 '../../base/base.gyp:base_java', | 363 '../../base/base.gyp:base_java', |
| 365 '../../base/base.gyp:base_java_test_support', | 364 '../../base/base.gyp:base_java_test_support', |
| 366 '../../chrome/chrome.gyp:chrome_java', | 365 '../../chrome/chrome.gyp:chrome_java', |
| 367 '../../chrome/chrome.gyp:chrome_java_test_support', | 366 '../../chrome/chrome.gyp:chrome_java_test_support', |
| 368 '../../sync/sync.gyp:sync_java', | 367 '../../sync/sync.gyp:sync_java', |
| 369 '../../sync/sync.gyp:sync_java_test_support', | 368 '../../sync/sync.gyp:sync_java_test_support', |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 } | 419 } |
| 421 ], | 420 ], |
| 422 ], | 421 ], |
| 423 } | 422 } |
| 424 | 423 |
| 425 # Local Variables: | 424 # Local Variables: |
| 426 # tab-width:2 | 425 # tab-width:2 |
| 427 # indent-tabs-mode:nil | 426 # indent-tabs-mode:nil |
| 428 # End: | 427 # End: |
| 429 # vim: set expandtab tabstop=2 shiftwidth=2: | 428 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |