Revert 253938 "Enable icu_use_data_file_flag on Android"

May have caused crashes on Android layout test bots.

> Enable icu_use_data_file_flag on Android
> 
> 0. Roll icu to r249466 to copy Android-specific icudtl.dat
> 1. Turn it in build/common.gypi by default except for android webview build. Move it inside L2 var dict and pull it up to the top level var dict to make 'Google Chrome' build on Android happy. 
> 2. Add an entry for icudtl.dat to chrome/chrome_android_paks.gypi so that
> it's copied to assets directory for Chrome and related targets. 
> 3. Extract icudtl.dat from the asset and copy to DIR_ANDROID_APP_DATA and make it world-readable so that child processes (sandboxed with uid) can read it. 
> 4. Add icudtl.dat to MANDATORY_PAKS list in various Android build targets 
> 
> Google Chrome has #4 but in a separate CL ( https://chrome-internal-review.googlesource.com/#/c/155554/ ). That CL will land before this CL. 
> 
> TBR=avi@chromium.org
> BUG=72633
> TEST=base_unittests:*Convers*, net_unittests:*IDN*, browser tests on all platforms.
> 
> Review URL: https://codereview.chromium.org/156333002

TBR=jshin@chromium.org

Review URL: https://codereview.chromium.org/183863005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@254020 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
pkasting@chromium.org 2014-02-28 02:19:54 +00:00
Родитель e93c7fcc18
Коммит 7c000e597c
2 изменённых файлов: 15 добавлений и 11 удалений

Просмотреть файл

@ -123,7 +123,7 @@ def _GenerateDepsDirUsingIsolate(suite_name):
'--config-variable', 'OS', 'android',
'--config-variable', 'chromeos', '0',
'--config-variable', 'component', 'static_library',
'--config-variable', 'icu_use_data_file_flag', '1',
'--config-variable', 'icu_use_data_file_flag', '0',
'--config-variable', 'use_openssl', '0',
]
assert not cmd_helper.RunCmd(isolate_cmd)

Просмотреть файл

@ -820,15 +820,6 @@
'remoting%': 0,
'enable_printing%': 0,
}],
# By default, use ICU data file (icudtl.dat) on all platforms
# except when building Android WebView.
# TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
['android_webview_build==0', {
'icu_use_data_file_flag%' : 1,
}, {
'icu_use_data_file_flag%' : 0,
}],
],
# Set this to 1 to enable use of concatenated impulse responses
@ -978,7 +969,6 @@
'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
'use_system_libjpeg%': '<(use_system_libjpeg)',
'android_webview_build%': '<(android_webview_build)',
'icu_use_data_file_flag%': '<(icu_use_data_file_flag)',
'gyp_managed_install%': 0,
'create_standalone_apk%': 1,
'enable_app_list%': '<(enable_app_list)',
@ -1274,6 +1264,9 @@
# IPC fuzzer is disabled by default.
'enable_ipc_fuzzer%': 0,
# Whether or not to use "icu*.dat" file for ICU data.
# Do not use it by default.
'icu_use_data_file_flag%': 0,
# Force disable libstdc++ debug mode.
'disable_glibcxx_debug%': 0,
@ -1315,6 +1308,7 @@
}],
['OS=="win"', {
'windows_driver_kit_path%': '$(WDK_DIR)',
'icu_use_data_file_flag%': 1,
}],
['os_posix==1 and OS!="mac" and OS!="ios"', {
'conditions': [
@ -1337,11 +1331,21 @@
# can use breakpad for these builds.
'release_unwind_tables%': 0,
}],
# TODO(jungshik): Turn this on on Android.
# For ChromeOS, this should be turned on in chromeos-chrome.ebuild
# file as well by adding icu_use_data_file_flag=1 to BUILD_DEFINES.
['OS!="android"', {
'icu_use_data_file_flag%': 1,
}],
],
}], # os_posix==1 and OS!="mac" and OS!="ios"
['OS=="mac"', {
'icu_use_data_file_flag%': 1,
}], # os=="mac"
['OS=="ios"', {
'disable_nacl%': 1,
'enable_background%': 0,
'icu_use_data_file_flag%': 1,
'use_system_libxml%': 1,
'use_system_sqlite%': 1,
'locales==': [