Commit 7ab8b9be authored by sehr@chromium.org's avatar sehr@chromium.org

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
parent d20d0431
...@@ -4406,6 +4406,9 @@ ...@@ -4406,6 +4406,9 @@
], ],
}], }],
['_type=="shared_library" or _type=="loadable_module"', { ['_type=="shared_library" or _type=="loadable_module"', {
'ldflags!': [
'-Wl,--exclude-libs=ALL',
],
'ldflags': [ 'ldflags': [
'-Wl,-shared,-Bsymbolic', '-Wl,-shared,-Bsymbolic',
], ],
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="BINDATA" /> <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="BINDATA" />
</if> </if>
<include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" flattenhtml="true" type="BINDATA" /> <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_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_CSS" file="resources\about_nacl.css" flattenhtml="true" type="chrome_html" />
<include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="BINDATA" /> <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="BINDATA" />
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
<if expr="chromeos"> <if expr="chromeos">
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" /> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
</if> </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" /> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
</if> </if>
<if expr="is_android"> <if expr="is_android">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment