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

Issue 997523002: Relanding Add i18n support for Android App Restrictions. (Closed)

Created:
5 years, 9 months ago by knn
Modified:
5 years, 9 months ago
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Relanding Add i18n support for Android App Restrictions. Reason for revert: Changing the first output of grd file caused build to fail due to a bad depfile. Now depfile depends on a stampfile instead of first output. Hence this also adds an additional grit roll from r187 to r188. Effective grit roll from r186:r188 188: Allow depending on stamp for grit files. 187: Add a Policy template writer that generates Android resources which can be exposed through Android's App Restriction Schema. Original issue's description: > Revert of Add i18n support for Android App Restrictions. (patchset #7 id:120001 of https://codereview.chromium.org/865573002/) > > Reason for revert: > Broke some GN builds, e.g.: > > http://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/24483/steps/compile/logs/stdio > http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20GN/builds/11092/steps/compile/logs/stdio > > ninja: Entering directory `/mnt/data/b/build/slave/Linux_GN/build/src/out/Release' > ninja:error: expected depfile 'gen/chrome/policy_templates.d' to mention 'gen/chrome/app/policy/common/html/am/chrome_policy_list.html', got 'gen/chrome/app/policy/linux/examples/chrome.json' > > > Committed: https://crrev.com/27ee0fa9afe9cb97016e532bd0cecd1b011251b9 > Cr-Commit-Position: refs/heads/master@{#319773} BUG=450548 Committed: https://crrev.com/7b9eaf967bfa9731f1862fce2b4115a320411722 Cr-Commit-Position: refs/heads/master@{#322366}

Patch Set 1 : Original patch #

Patch Set 2 : Add landmine #

Patch Set 3 : Grit roll to add depend_on_stamp #

Patch Set 4 : Merge issue 996653002 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+459 lines, -153 lines) Patch
M DEPS View 1 2 1 chunk +1 line, -1 line 0 comments Download
M components/policy.gypi View 1 2 6 chunks +2 lines, -8 lines 0 comments Download
M components/policy/BUILD.gn View 1 2 3 5 chunks +34 lines, -17 lines 0 comments Download
A components/policy/resources/policy_templates.gni View 1 2 3 1 chunk +292 lines, -0 lines 0 comments Download
M components/policy/resources/policy_templates.grd View 1 3 chunks +114 lines, -59 lines 0 comments Download
M components/policy/resources/policy_templates.json View 1 2 1 chunk +4 lines, -0 lines 0 comments Download
M components/policy/tools/generate_policy_source.py View 1 7 chunks +12 lines, -68 lines 0 comments Download

Messages

Total messages: 17 (4 generated)
knn
Created Revert of Revert of Add i18n support for Android App Restrictions.
5 years, 9 months ago (2015-03-10 11:13:08 UTC) #1
knn
jochen@chromium.org: Please review changes in build/get_landmines.py. Need to clobber builds as policy_templates.grd has changed.
5 years, 9 months ago (2015-03-10 11:28:16 UTC) #3
bartfab (slow)
lgtm
5 years, 9 months ago (2015-03-10 12:54:38 UTC) #4
jochen (gone - plz use gerrit)
Nico, is it expected that ninja needs a landmine for grd changes? (The error message ...
5 years, 9 months ago (2015-03-10 13:08:01 UTC) #6
Nico
As a general guideline, landmines should never be required. They're clutches to be used when ...
5 years, 9 months ago (2015-03-10 14:01:39 UTC) #7
Nico
The ninja: Entering directory `/mnt/data/b/build/slave/Linux_GN/build/src/out/Release' ninja:error: expected depfile 'gen/chrome/policy_templates.d' to mention 'gen/chrome/app/policy/common/html/am/chrome_policy_list.html', got 'gen/chrome/app/policy/linux/examples/chrome.json' from ...
5 years, 9 months ago (2015-03-10 14:02:53 UTC) #8
knn
On 2015/03/10 14:02:53, Nico wrote: > The > > ninja: Entering directory > `/mnt/data/b/build/slave/Linux_GN/build/src/out/Release' > ...
5 years, 9 months ago (2015-03-10 14:13:24 UTC) #9
jochen (gone - plz use gerrit)
Nico, should this land meanwhile with the landmine?
5 years, 9 months ago (2015-03-10 14:36:02 UTC) #10
Nico
imho no On Tue, Mar 10, 2015 at 7:36 AM, <jochen@chromium.org> wrote: > Nico, should ...
5 years, 9 months ago (2015-03-10 14:37:01 UTC) #11
Nico
(but if you're in a rush and want to land this quickly while fixing gn ...
5 years, 9 months ago (2015-03-10 14:38:05 UTC) #12
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/997523002/170001
5 years, 9 months ago (2015-03-26 12:18:00 UTC) #15
commit-bot: I haz the power
Committed patchset #4 (id:170001)
5 years, 9 months ago (2015-03-26 12:21:37 UTC) #16
commit-bot: I haz the power
5 years, 9 months ago (2015-03-26 12:22:16 UTC) #17
Message was sent while issue was closed.
Patchset 4 (id:??) landed as
https://crrev.com/7b9eaf967bfa9731f1862fce2b4115a320411722
Cr-Commit-Position: refs/heads/master@{#322366}

Powered by Google App Engine
This is Rietveld 408576698