diff options
| author | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 17:20:42 +0000 |
|---|---|---|
| committer | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 17:20:42 +0000 |
| commit | 7ab8b9be98d03317adeae4302820e657721e5280 (patch) | |
| tree | 0cb78d90af4c0b7e13667d1c374bdc10c6b7884e | |
| parent | d20d04315d2dabd1e5d613adb8dda59a10325508 (diff) | |
| download | chromium_src-7ab8b9be98d03317adeae4302820e657721e5280.zip chromium_src-7ab8b9be98d03317adeae4302820e657721e5280.tar.gz chromium_src-7ab8b9be98d03317adeae4302820e657721e5280.tar.bz2 | |
Enable about:nacl and correct symbol visibility for the plugin
After this change, if libppGoogleNaClPluginChrome.so is placed in the install
directory it correctly starts and attempts to create a subprocess.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3032
R=bradnelson@google.com, darin@chromium.org
Review URL: https://codereview.chromium.org/329853002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276724 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | chrome/browser/browser_resources.grd | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 0c1d415..1599cf6 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -4406,6 +4406,9 @@ ], }], ['_type=="shared_library" or _type=="loadable_module"', { + 'ldflags!': [ + '-Wl,--exclude-libs=ALL', + ], 'ldflags': [ '-Wl,-shared,-Bsymbolic', ], diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 0d89ea9..c8e8a3a 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -87,7 +87,7 @@ <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="BINDATA" /> </if> <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" flattenhtml="true" type="BINDATA" /> - <if expr="not is_android"> + <if expr="not disable_nacl"> <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flattenhtml="true" type="chrome_html" /> <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="BINDATA" /> @@ -225,7 +225,7 @@ <if expr="chromeos"> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" /> </if> - <if expr="desktop_linux"> + <if expr="desktop_linux or (is_android and enable_plugins)"> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" /> </if> <if expr="is_android"> |