diff options
Diffstat (limited to 'chromium/chrome/chrome_android.gypi')
| -rw-r--r-- | chromium/chrome/chrome_android.gypi | 79 |
1 files changed, 40 insertions, 39 deletions
diff --git a/chromium/chrome/chrome_android.gypi b/chromium/chrome/chrome_android.gypi index 7de13866ca6..d986c571feb 100644 --- a/chromium/chrome/chrome_android.gypi +++ b/chromium/chrome/chrome_android.gypi @@ -4,19 +4,18 @@ { 'variables': { 'chromium_code': 1, - 'package_name': 'chromium_testshell', + 'package_name': 'chrome_shell_apk', }, 'includes': [ 'chrome_android_paks.gypi', # Included for the list of pak resources. ], 'targets': [ { - 'target_name': 'libchromiumtestshell', + 'target_name': 'libchromeshell', 'type': 'shared_library', 'dependencies': [ '../base/base.gyp:base', 'chrome_android_core', - 'chromium_testshell_jni_headers', 'chrome.gyp:browser_ui', '../content/content.gyp:content_app_browser', ], @@ -24,15 +23,12 @@ # This file must always be included in the shared_library step to ensure # JNI_OnLoad is exported. 'app/android/chrome_jni_onload.cc', - 'android/testshell/chrome_main_delegate_testshell_android.cc', - 'android/testshell/chrome_main_delegate_testshell_android.h', - "android/testshell/testshell_google_location_settings_helper.cc", - "android/testshell/testshell_google_location_settings_helper.h", - 'android/testshell/testshell_tab.cc', - 'android/testshell/testshell_tab.h', + 'android/shell/chrome_main_delegate_chrome_shell_android.cc', + 'android/shell/chrome_main_delegate_chrome_shell_android.h', + "android/shell/chrome_shell_google_location_settings_helper.cc", + "android/shell/chrome_shell_google_location_settings_helper.h", ], 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell', '../skia/config', ], 'conditions': [ @@ -43,56 +39,60 @@ }], ], }], - [ 'android_use_tcmalloc==1', { + [ 'use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', ], }], + ['OS=="android"', { + 'ldflags': [ + # Some android targets still depend on --gc-sections to link. + # TODO: remove --gc-sections for Debug builds (crbug.com/159847). + '-Wl,--gc-sections', + ], + }], ], }, { - 'target_name': 'chromium_testshell', + 'target_name': 'chrome_shell_apk', 'type': 'none', 'dependencies': [ + 'chrome_java', + 'chrome_shell_paks', + 'libchromeshell', '../media/media.gyp:media_java', - 'chrome.gyp:chrome_java', - 'chromium_testshell_paks', - 'libchromiumtestshell', ], 'variables': { - 'apk_name': 'ChromiumTestShell', - 'manifest_package_name': 'org.chromium.chrome.testshell', - 'java_in_dir': 'android/testshell/java', - 'resource_dir': 'android/testshell/res', + 'apk_name': 'ChromeShell', + 'manifest_package_name': 'org.chromium.chrome.shell', + 'java_in_dir': 'android/shell/java', + 'resource_dir': 'android/shell/res', 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', - 'native_lib_target': 'libchromiumtestshell', + 'native_lib_target': 'libchromeshell', 'native_lib_version_name': '<(version_full)', 'additional_input_paths': [ '<@(chrome_android_pak_output_resources)', ], + 'conditions': [ + ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64"', { + # Only enable the chromium linker on regular builds, since the + # component build crashes on Android 4.4. See b/11379966 + 'use_chromium_linker': '1', + }], + ], }, 'includes': [ '../build/java_apk.gypi', ], }, { - 'target_name': 'chromium_testshell_jni_headers', - 'type': 'none', - 'sources': [ - 'android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java', - ], - 'variables': { - 'jni_gen_package': 'chromium_testshell', - 'jni_generator_ptr_type': 'long', - }, - 'includes': [ '../build/jni_generator.gypi' ], - }, - { - # chromium_testshell creates a .jar as a side effect. Any java targets + # chrome_shell_apk creates a .jar as a side effect. Any java targets # that need that .jar in their classpath should depend on this target, - # chromium_testshell_java. Dependents of chromium_testshell receive its + # chrome_shell_apk_java. Dependents of chrome_shell_apk receive its # jar path in the variable 'apk_output_jar_path'. - 'target_name': 'chromium_testshell_java', + # This target should only be used by targets which instrument + # chrome_shell_apk. + 'target_name': 'chrome_shell_apk_java', 'type': 'none', 'dependencies': [ - 'chromium_testshell', + 'chrome_shell_apk', ], 'includes': [ '../build/apk_fake_jar.gypi' ], }, @@ -105,13 +105,14 @@ 'chrome.gyp:plugin', 'chrome.gyp:renderer', 'chrome.gyp:utility', + # TODO(kkimlabs): Move this to chrome.gyp:browser when the dependent + # is upstreamed. + '../components/components.gyp:enhanced_bookmarks', '../content/content.gyp:content', '../content/content.gyp:content_app_browser', ], 'include_dirs': [ '..', - '<(SHARED_INTERMEDIATE_DIR)/android', - '<(SHARED_INTERMEDIATE_DIR)/chrome', '<(android_ndk_include)', ], 'sources': [ @@ -130,7 +131,7 @@ }, }, { - 'target_name': 'chromium_testshell_paks', + 'target_name': 'chrome_shell_paks', 'type': 'none', 'dependencies': [ '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', |