-
rbpotter authored
Since shared resources are now preprocessed before being passed to rollup, there should not be any <if expr> in files used as inputs to rollup. For UI specific files (not shared), preprocessing should be done before passing files to rollup by either (1) passing rollup the output of a preprocess_grit target or (2) correctly specifying preprocessing for grd entries corresponding to files using <if expr> Since there are no <if expr> in any inputs, there should also be no such expressions in the bundled output. This CL: (1) Adds a check and assert that no <if expr> are found in the bundled output files generated by rollup. (2) Removes preprocess="true" for files generated by rollup, as it should now be unnecessary. (3) Fixes a few existing cases in settings/OS settings, where preprocessing was not specified in the grd for files that use <if expr>. Bug: 1071641 Change-Id: I0f2b48af1d4b200a2f721217e8f294f296c9a5ce Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2415044Reviewed-by:
dpapad <dpapad@chromium.org> Commit-Queue: Rebekah Potter <rbpotter@chromium.org> Cr-Commit-Position: refs/heads/master@{#808003}
7177fe76