Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Issue 14834011: Android: use grit target platform instead of define. (Closed)

Created:
7 years, 7 months ago by Torne
Modified:
7 years, 7 months ago
Reviewers:
jamesr, brettw, sky, Jói, newt (away)
CC:
chromium-reviews, joi+watch-content_chromium.org, darin-cc_chromium.org, jam, jshin+watch_chromium.org
Visibility:
Public.

Description

Android: use grit target platform instead of define. grit now supports passing "-t android" to set the target platform to android, which sets is_android and is_posix, and does *not* set is_linux (matching the OS_* macros). Use this instead of defining an "android" macro. This requires one actual condition change in app_locale_settings as the Android port was previously depending on is_linux being true for its definitions of IDS_WEB_FONT_*. The other grd changes are all trivial substitutions. BUG=239434 TBR=jamesr@chromium.org, joi@chromium.org, newt@chromium.org, sky@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=201310

Patch Set 1 #

Patch Set 2 : Rebase and change additional pp_ifdef #

Patch Set 3 : Add missed pp_ifdef(android) #

Unified diffs Side-by-side diffs Delta from patch set Stats (+160 lines, -160 lines) Patch
M build/common.gypi View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/app/bookmarks_strings.grdp View 1 2 3 chunks +4 lines, -4 lines 0 comments Download
M chrome/app/chromium_strings.grd View 1 2 3 chunks +6 lines, -6 lines 0 comments Download
M chrome/app/generated_resources.grd View 60 chunks +90 lines, -90 lines 0 comments Download
M chrome/app/google_chrome_strings.grd View 1 2 3 chunks +6 lines, -6 lines 0 comments Download
M chrome/app/resources/locale_settings.grd View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/browser_resources.grd View 1 2 10 chunks +11 lines, -11 lines 0 comments Download
M chrome/browser/resources/about_memory_linux.css View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/resources/about_memory_linux.html View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/resources/about_version.html View 1 2 4 chunks +6 lines, -6 lines 0 comments Download
M chrome/browser/resources/flags.css View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/resources/flags.html View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/resources/history/history.css View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/resources/history/history.html View 1 2 6 chunks +11 lines, -11 lines 0 comments Download
M chrome/browser/resources/net_export/net_export.html View 1 2 1 chunk +1 line, -1 line 0 comments Download
M chrome/renderer/resources/blocked_plugin.html View 1 2 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/renderer/resources/neterror.html View 1 2 8 chunks +8 lines, -8 lines 0 comments Download
M chrome/renderer/resources/plugin_placeholders.css View 1 2 2 chunks +4 lines, -4 lines 0 comments Download
M chrome/renderer/resources/renderer_resources.grd View 1 chunk +1 line, -1 line 0 comments Download
M content/content_resources.grd View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ui/base/strings/app_locale_settings.grd View 1 chunk +1 line, -1 line 0 comments Download
M webkit/glue/resources/webkit_resources.grd View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 12 (0 generated)
Torne
This depends on https://codereview.chromium.org/14813026/ being landed in grit and rolled into Chromium. I have tested ...
7 years, 7 months ago (2013-05-14 11:32:44 UTC) #1
Jói
LGTM
7 years, 7 months ago (2013-05-14 18:14:13 UTC) #2
newt (away)
lgtm
7 years, 7 months ago (2013-05-14 18:53:46 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/torne@chromium.org/14834011/5001
7 years, 7 months ago (2013-05-15 15:48:46 UTC) #4
commit-bot: I haz the power
Retried try job too often on chromium_presubmit for step(s) presubmit http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_presubmit&number=3058
7 years, 7 months ago (2013-05-15 15:58:26 UTC) #5
Torne
Need OWNERS for: sky: chrome and ui brettw: content jamesr: webkit
7 years, 7 months ago (2013-05-15 16:07:10 UTC) #6
jamesr
webkit/ lgtm
7 years, 7 months ago (2013-05-15 17:12:28 UTC) #7
sky
Rubber stamp LGTM
7 years, 7 months ago (2013-05-15 21:09:21 UTC) #8
Torne
TBR'ing brettw as this patch is chasing a moving target :)
7 years, 7 months ago (2013-05-21 09:33:00 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/torne@chromium.org/14834011/16001
7 years, 7 months ago (2013-05-21 09:33:12 UTC) #10
commit-bot: I haz the power
Retried try job too often on win_rel for step(s) browser_tests http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&number=151429
7 years, 7 months ago (2013-05-21 15:18:55 UTC) #11
Torne
7 years, 7 months ago (2013-05-21 15:29:31 UTC) #12
Message was sent while issue was closed.
Committed patchset #3 manually as r201310 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698