diff options
| author | msw <msw@chromium.org> | 2016-02-09 16:26:16 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 00:27:47 +0000 |
| commit | 40ddaa81f4e1e88439377986ce5c268afdf16e1d (patch) | |
| tree | c5a2442e279040baf64c11ae2622db7e37e95a76 /tools | |
| parent | 382da786010fc309637e9afba4593ff65ae46e34 (diff) | |
| download | chromium_src-40ddaa81f4e1e88439377986ce5c268afdf16e1d.zip chromium_src-40ddaa81f4e1e88439377986ce5c268afdf16e1d.tar.gz chromium_src-40ddaa81f4e1e88439377986ce5c268afdf16e1d.tar.bz2 | |
Support building ash targets with use_ash=0 and use_aura=1.
Support building/running ash_unittests and ash_shell_with_content.
Change some build |use_ash| checks to |use_aura| (or remove them).
Avoid the unspecified ash dependency on chrome resources!
Explicitly load new ash_test_*.pak image/string resources instead.
(avoids including ash_resources in chrome paks w/use_aura builds)
Reserve more resource IDs for ash_strings to avoid overlap.
(uses 244 IDs now; reserve 300 instead of 200 to fit existing)
Reserve fewer content shell resource IDs, to avoid exceeding 3100.
(uses 4 IDs now; reserve 150 instead of 250 to keep current total)
https://code.google.com/p/chromium/codesearch#chromium/src/out/Debug/gen/content/shell/grit/shell_resources.h
Use base::i18n::GetConfiguredLocale(), in several ash_unittests.
(l10n_util::GetApplicationLocale fails IsLocaleAvailable('en-US'))
(because it's not loading the chrome locale data anymore)
(seems okay to pair with base::i18n::SetICUDefaultLocale)
TODO: Fix ash_unittests failures/crahes (repros on ToT w/use_ash).
TODO: Fix ash_shell_with_content crash (repros on ToT w/use_ash).
TODO: Load ash resources; not 'common' in ash_shell_with_content.
TODO: Exclude ash files from message_center crbug.com/585175.
TODO: Support ash_test_resources_300_percent.pak, etc.?
BUG=584038,585175
TEST=Building ash_unittests and ash_shell_with_content works with use_ash=0 and use_aura=1.
R=oshima@chromium.org,dewittj@chromium.org,sky@chromium.org
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1664013002
Cr-Commit-Position: refs/heads/master@{#374547}
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gritsettings/resource_ids | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index fe03946..0528718 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids @@ -181,43 +181,43 @@ }, # This file is generated during the build. "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": { - "includes": [24700], + "includes": [24600], }, # iOS resources overlap with android_webview, ash, chromeos and extensions_api, # as these are not used on iOS. "ios/chrome/app/strings/ios_locale_settings.grd": { - "messages": [24950], + "messages": [24850], }, "ios/chrome/app/strings/ios_strings.grd": { - "messages": [24955], + "messages": [24855], }, # Chromium strings and Google Chrome strings must start at the same id. # We only use one file depending on whether we're building Chromium or # Google Chrome. "ios/chrome/app/strings/ios_chromium_strings.grd": { - "messages": [25855], + "messages": [25755], }, "ios/chrome/app/strings/ios_google_chrome_strings.grd": { - "messages": [25855], + "messages": [25755], }, "ios/chrome/app/resources/ios_resources.grd": { "structures": [25950], - "includes": [26160], + "includes": [26060], }, "ios/chrome/app/theme/ios_theme_resources.grd": { - "structures": [25970], + "structures": [25870], }, "ios/chrome/today_extension/strings/ios_today_extension_strings.grd": { - "messages": [26435], + "messages": [26335], }, "ash/ash_strings.grd": { - "messages": [24950], + "messages": [24850], }, "android_webview/ui/aw_resources.grd": { - "includes": [24950], + "includes": [24850], }, "android_webview/ui/aw_strings.grd": { - "messages": [25050], + "messages": [24950], }, "ui/chromeos/resources/ui_chromeos_resources.grd": { "structures": [25150], |