| commit | 996e4238b31f621fabe490f34b67f5a9edb5872a | [log] [tgz] |
|---|---|---|
| author | sehr <[email protected]> | Fri Jan 30 18:15:45 2015 |
| committer | Commit bot <[email protected]> | Fri Jan 30 18:17:16 2015 |
| tree | af3cce34b8f7c6aa0d6d4f081fa70396c745b071 | |
| parent | 8560d971fb0d40eb89c9bb3a61c5beb6f1d6f2f2 [diff] [blame] |
Get nacl building again for android BUG= https://code.google.com/p/nativeclient/issues/detail?id=3032 Review URL: https://codereview.chromium.org/831813004 Cr-Commit-Position: refs/heads/master@{#313945}
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 663b4f6..b6a47767 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd
@@ -81,7 +81,7 @@ <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.js" type="BINDATA" /> </if> - <if expr="not is_android"> + <if expr="enable_plugins"> <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="BINDATA" /> </if>