commit | 7b9eaf967bfa9731f1862fce2b4115a320411722 | [log] [tgz] |
---|---|---|
author | knn <knn@chromium.org> | Thu Mar 26 12:21:30 2015 |
committer | Commit bot <commit-bot@chromium.org> | Thu Mar 26 12:22:03 2015 |
tree | 0e109c5fb9c5f41b11b10fca6f91f7624ef527b3 | |
parent | 544064febdf079ec4d2f63548b0c80c17dc93b6f [diff] |
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 Review URL: https://codereview.chromium.org/997523002 Cr-Commit-Position: refs/heads/master@{#322366}