| 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 | 9 |
| 10 | |
| 11 # GYP: //chrome/chrome.gyp:chrome_java (resources part) | 10 # GYP: //chrome/chrome.gyp:chrome_java (resources part) |
| 12 android_resources("chrome_java_resources") { | 11 android_resources("chrome_java_resources") { |
| 13 resource_dirs = [ | 12 resource_dirs = [ |
| 14 "java/res", | 13 "java/res", |
| 15 ] | 14 ] |
| 16 deps = [ | 15 deps = [ |
| 17 ":chrome_strings_grd", | 16 ":chrome_strings_grd", |
| 18 "//content/public/android:content_java_resources", | 17 "//content/public/android:content_java_resources", |
| 19 "//chrome/app:java_strings_grd", | 18 "//chrome/app:java_strings_grd", |
| 20 "//third_party/android_tools:android_support_v7_appcompat_resources", | 19 "//third_party/android_tools:android_support_v7_appcompat_resources", |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 #'conditions': [ | 210 #'conditions': [ |
| 212 #[ 'OS=="android"', { | 211 #[ 'OS=="android"', { |
| 213 #'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], | 212 #'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], |
| 214 #}], | 213 #}], |
| 215 #], | 214 #], |
| 216 #}], | 215 #}], |
| 217 } | 216 } |
| 218 | 217 |
| 219 # TODO(GYP, cjhopman): make chrome_shell_base actually link and then move it to | 218 # TODO(GYP, cjhopman): make chrome_shell_base actually link and then move it to |
| 220 # deps. Also, actually compile the main delegates at that point. | 219 # deps. Also, actually compile the main delegates at that point. |
| 221 # GYP: //chrome/chrome_browser.gypi:libchromeshell | 220 # GYP: //chrome/chrome_shell.gypi:libchromeshell |
| 222 shared_library("chrome_shell") { | 221 shared_library("chrome_shell") { |
| 223 testonly = true | 222 testonly = true |
| 224 sources = [ | 223 sources = [ |
| 225 # This file must always be included in the shared_library step to ensure | 224 # This file must always be included in the shared_library step to ensure |
| 226 # JNI_OnLoad is exported. | 225 # JNI_OnLoad is exported. |
| 227 #"//chrome/app/android/chrome_jni_onload.cc", | 226 #"//chrome/app/android/chrome_jni_onload.cc", |
| 228 #"shell/chrome_main_delegate_chrome_shell_android.cc", | 227 #"shell/chrome_main_delegate_chrome_shell_android.cc", |
| 229 #"shell/chrome_main_delegate_chrome_shell_android.h", | 228 #"shell/chrome_main_delegate_chrome_shell_android.h", |
| 230 ] | 229 ] |
| 231 deps = [ | 230 deps = [ |
| 232 #":chrome_shell_base", | 231 #":chrome_shell_base", |
| 233 ] | 232 ] |
| 234 deps = [ ":chrome_java" ] | 233 deps = [ ":chrome_java" ] |
| 235 datadeps = [ | 234 datadeps = [ |
| 236 ":chrome_shell_base" | 235 ":chrome_shell_base" |
| 237 ] | 236 ] |
| 238 } | 237 } |
| 239 | 238 |
| 240 # GYP: //chrome/chrome_browser.gypi:libchromesyncshell | 239 # GYP: //chrome/chrome_shell.gypi:libchromesyncshell |
| 241 shared_library("chrome_sync_shell") { | 240 shared_library("chrome_sync_shell") { |
| 242 testonly = true | 241 testonly = true |
| 243 sources = [ | 242 sources = [ |
| 244 # This file must always be included in the shared_library step to ensure | 243 # This file must always be included in the shared_library step to ensure |
| 245 # JNI_OnLoad is exported. | 244 # JNI_OnLoad is exported. |
| 246 #"//chrome/app/android/chrome_jni_onload.cc", | 245 #"//chrome/app/android/chrome_jni_onload.cc", |
| 247 #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc", | 246 #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc", |
| 248 #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.h", | 247 #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.h", |
| 249 ] | 248 ] |
| 250 deps = [ | 249 deps = [ |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 "//chrome:packed_extra_resources", | 341 "//chrome:packed_extra_resources", |
| 343 ] | 342 ] |
| 344 | 343 |
| 345 if (icu_use_data_file) { | 344 if (icu_use_data_file) { |
| 346 sources += [ | 345 sources += [ |
| 347 "$root_build_dir/icudtl.dat" | 346 "$root_build_dir/icudtl.dat" |
| 348 ] | 347 ] |
| 349 } | 348 } |
| 350 } | 349 } |
| 351 | 350 |
| 352 # GYP: //chrome/chrome_browser.gypi:chrome_shell_apk | 351 chrome_shell_manifest = "$target_gen_dir/chrome_shell_manifest/AndroidManifest.x
ml" |
| 352 |
| 353 # GYP: //chrome/chrome_shell.gypi:chrome_shell_manifest |
| 354 jinja_template("chrome_shell_manifest") { |
| 355 testonly = true |
| 356 input = "shell/java/AndroidManifest.xml" |
| 357 output = chrome_shell_manifest |
| 358 } |
| 359 |
| 360 # GYP: //chrome/chrome_shell.gypi:chrome_shell_apk |
| 353 android_apk("chrome_shell_apk") { | 361 android_apk("chrome_shell_apk") { |
| 354 testonly = true | 362 testonly = true |
| 355 deps = [ | 363 deps = [ |
| 356 ":chrome_shell_resources", | 364 ":chrome_shell_resources", |
| 357 ":chrome_shell_java", | 365 ":chrome_shell_java", |
| 358 ":chrome_shell_assets", | 366 ":chrome_shell_assets", |
| 359 ":chrome_shell", | 367 ":chrome_shell", |
| 360 ] | 368 ] |
| 361 apk_name = "ChromeShell" | 369 apk_name = "ChromeShell" |
| 362 android_manifest = "shell/java/AndroidManifest.xml" | 370 android_manifest = chrome_shell_manifest |
| 363 native_libs = [ | 371 native_libs = [ |
| 364 "$root_build_dir/lib.stripped/libchrome_shell.so" | 372 "$root_build_dir/lib.stripped/libchrome_shell.so" |
| 365 ] | 373 ] |
| 366 asset_location = chrome_shell_assets_dir | 374 asset_location = chrome_shell_assets_dir |
| 367 | 375 |
| 368 #TODO(GYP): | 376 #TODO(GYP): |
| 369 #'variables': { | 377 #'variables': { |
| 370 #'conditions': [ | 378 #'conditions': [ |
| 371 #['component != "shared_library" and target_arch != "arm64" and target_arch != "
x64" and profiling_full_stack_frames != 1', { | 379 #['component != "shared_library" and target_arch != "arm64" and target_arch != "
x64" and profiling_full_stack_frames != 1', { |
| 372 ## Only enable the chromium linker on regular builds, since the | 380 ## Only enable the chromium linker on regular builds, since the |
| 373 ## component build crashes on Android 4.4. See b/11379966 | 381 ## component build crashes on Android 4.4. See b/11379966 |
| 374 #'use_chromium_linker': '1', | 382 #'use_chromium_linker': '1', |
| 375 #}], | 383 #}], |
| 376 #], | 384 #], |
| 377 #}, | 385 #}, |
| 378 | 386 |
| 379 } | 387 } |
| 380 | 388 |
| 381 # GYP: //chrome/chrome_browser.gypi:chrome_sync_shell_apk | 389 # GYP: //chrome/chrome_shell.gypi:chrome_sync_shell_apk |
| 382 android_apk("chrome_sync_shell_apk") { | 390 android_apk("chrome_sync_shell_apk") { |
| 383 testonly = true | 391 testonly = true |
| 384 deps = [ | 392 deps = [ |
| 385 ":chrome_shell_resources", | 393 ":chrome_shell_resources", |
| 386 ":chrome_shell_java", | 394 ":chrome_shell_java", |
| 387 ":chrome_shell_assets", | 395 ":chrome_shell_assets", |
| 388 ":chrome_sync_shell", | 396 ":chrome_sync_shell", |
| 389 ] | 397 ] |
| 390 apk_name = "ChromeSyncShell" | 398 apk_name = "ChromeSyncShell" |
| 391 android_manifest = "sync_shell/java/AndroidManifest.xml" | 399 android_manifest = "sync_shell/java/AndroidManifest.xml" |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 496 process_version("chrome_version_java") { | 504 process_version("chrome_version_java") { |
| 497 source = "java/ChromeVersionConstants.java.version" | 505 source = "java/ChromeVersionConstants.java.version" |
| 498 output = chrome_version_java_file | 506 output = chrome_version_java_file |
| 499 } | 507 } |
| 500 | 508 |
| 501 zip("chrome_version_srcjar") { | 509 zip("chrome_version_srcjar") { |
| 502 inputs = [ chrome_version_java_file ] | 510 inputs = [ chrome_version_java_file ] |
| 503 output = "$target_gen_dir/$target_name.srcjar" | 511 output = "$target_gen_dir/$target_name.srcjar" |
| 504 base_dir = chrome_version_java_dir | 512 base_dir = chrome_version_java_dir |
| 505 } | 513 } |
| OLD | NEW |