diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/plugin.gyp | 8 | ||||
| -rw-r--r-- | ppapi/ppapi.gyp | 11 | ||||
| -rw-r--r-- | ppapi/ppapi_cpp.gypi | 12 | ||||
| -rw-r--r-- | ppapi/ppapi_gl.gypi | 8 |
6 files changed, 16 insertions, 27 deletions
@@ -7,7 +7,7 @@ vars = { "webkit_revision": "97838", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", - "nacl_revision": "6941", + "nacl_revision": "6965", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. # TODO(brettw) We should use the "From" syntax to avoid hardcoding the diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp index 88e682e..b071b0a 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp +++ b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp @@ -65,7 +65,7 @@ '<(DEPTH)/ppapi', ], 'dependencies': [ - '<(DEPTH)/native_client/src/shared/ppapi/ppapi.gyp:ppapi_c_nacl', + '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', ], }, ], diff --git a/ppapi/native_client/src/trusted/plugin/plugin.gyp b/ppapi/native_client/src/trusted/plugin/plugin.gyp index c60d682..a74fb92 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin.gyp +++ b/ppapi/native_client/src/trusted/plugin/plugin.gyp @@ -63,8 +63,6 @@ '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio', '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc', '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', - '<(DEPTH)/native_client/src/shared/ppapi/ppapi.gyp:ppapi_cpp_nacl', - '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser', '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:jsoncpp', @@ -75,6 +73,8 @@ '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gyp:simple_service', '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service.gyp:reverse_service', '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref', + '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser', + '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', ], }], }], @@ -96,8 +96,6 @@ '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio', '<(DEPTH)/native_client/src/shared/imc/imc.gyp:imc', '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform', - '<(DEPTH)/native_client/src/shared/ppapi/ppapi.gyp:ppapi_cpp_nacl', - '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser', '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc', '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:jsoncpp', '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer', @@ -107,6 +105,8 @@ '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gyp:simple_service', '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service.gyp:reverse_service', '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref', + '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser', + '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', ], 'conditions': [ ['OS=="mac"', { diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp index fa850d5..f1eb48f 100644 --- a/ppapi/ppapi.gyp +++ b/ppapi/ppapi.gyp @@ -9,17 +9,6 @@ { 'variables': { 'chromium_code': 1, # Use higher warning level. - - # NaCl also uses the C and C++ PPAPI targets. We want it to be able to use - # its own version of PPAPI when compiling into Chrome, which means we'll - # actually have two instances of each library in the checkout (though not - # compiled into the same binary since NaCl is a shared library). - # - # This value is the suffix that will be appended to the relevant projects. - # In Chrome, it's empty so the projects have the same name. NaCl sets this - # to "_nacl" and includes the .gypi files below, giving it different names - # for these projects. - 'nacl_ppapi_library_suffix': '', }, 'target_defaults': { 'conditions': [ diff --git a/ppapi/ppapi_cpp.gypi b/ppapi/ppapi_cpp.gypi index 5c7ca07..48378f7 100644 --- a/ppapi/ppapi_cpp.gypi +++ b/ppapi/ppapi_cpp.gypi @@ -5,7 +5,7 @@ { 'targets': [ { - 'target_name': 'ppapi_c<(nacl_ppapi_library_suffix)', + 'target_name': 'ppapi_c', 'type': 'none', 'all_dependent_settings': { 'include_dirs+': [ @@ -133,10 +133,10 @@ ], }, { - 'target_name': 'ppapi_cpp_objects<(nacl_ppapi_library_suffix)', + 'target_name': 'ppapi_cpp_objects', 'type': 'static_library', 'dependencies': [ - 'ppapi_c<(nacl_ppapi_library_suffix)' + 'ppapi_c' ], 'include_dirs+': [ '..', @@ -285,11 +285,11 @@ ], }, { - 'target_name': 'ppapi_cpp<(nacl_ppapi_library_suffix)', + 'target_name': 'ppapi_cpp', 'type': 'static_library', 'dependencies': [ - 'ppapi_c<(nacl_ppapi_library_suffix)', - 'ppapi_cpp_objects<(nacl_ppapi_library_suffix)', + 'ppapi_c', + 'ppapi_cpp_objects', ], 'include_dirs+': [ '..', diff --git a/ppapi/ppapi_gl.gypi b/ppapi/ppapi_gl.gypi index 64e46b4..e9664de 100644 --- a/ppapi/ppapi_gl.gypi +++ b/ppapi/ppapi_gl.gypi @@ -8,10 +8,10 @@ ], 'targets': [ { - 'target_name': 'ppapi_egl<(nacl_ppapi_library_suffix)', + 'target_name': 'ppapi_egl', 'type': 'static_library', 'dependencies': [ - '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c<(nacl_ppapi_library_suffix)', + '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', ], 'include_dirs': [ 'lib/gl/include', @@ -45,10 +45,10 @@ ], }, { - 'target_name': 'ppapi_gles2<(nacl_ppapi_library_suffix)', + 'target_name': 'ppapi_gles2', 'type': 'static_library', 'dependencies': [ - 'ppapi_c<(nacl_ppapi_library_suffix)', + 'ppapi_c', ], 'include_dirs': [ 'lib/gl/include', |