diff options
author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-12 00:24:40 +0000 |
---|---|---|
committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-12 00:24:40 +0000 |
commit | 7d36c295404f4d57607fea402cd1809568f72082 (patch) | |
tree | d950890d24e622dbd02ee26a5f29e129d63a959b /ppapi/ppapi_cpp.gypi | |
parent | 05f75566c6d87d434aaf5a98d3c1511f61599f44 (diff) | |
download | chromium_src-7d36c295404f4d57607fea402cd1809568f72082.zip chromium_src-7d36c295404f4d57607fea402cd1809568f72082.tar.gz chromium_src-7d36c295404f4d57607fea402cd1809568f72082.tar.bz2 |
Enable untrusted GYP builds in Chrome (irt via gyp)
Reconstruct of CL to enable untrsuted builds see:
http://codereview.chromium.org/8416025.
This CL will enable untrusted builds in Chrome. The first step
is to enable enable building the IRT via this technique instead
of using scons.
DEPS:
We bump NaCl deps to fix untrusted.gypi in NaCl Repo
ppapi/ppapi_cpp.gypi+
Add ppapi_cpp library for NEXE
ppapi/native_client/native_client.gyp
Add ppapi library for NEXE (copy linker script to toolchain dir)
Add nacl_irt target (the actual IRT.NEXE)
ppapi/ppapi.gyp & ppapi/ppapi_internal.gyp
Pull in untrusted.gypi from NaCl repo
ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp
Add ppruntime library for NEXE
chrome/nacl.gypi
Remove scons header scan and scons irt build
Add dependency to untrusted IRT build in native_client.gyp
BUG= http://code.google.com/p/chromium/issues/detail?id=96782
TEST= try
TBR=dmichael@chromium.org
Review URL: http://codereview.chromium.org/8502036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_cpp.gypi')
-rw-r--r-- | ppapi/ppapi_cpp.gypi | 141 |
1 files changed, 141 insertions, 0 deletions
diff --git a/ppapi/ppapi_cpp.gypi b/ppapi/ppapi_cpp.gypi index 9771de3..918c659 100644 --- a/ppapi/ppapi_cpp.gypi +++ b/ppapi/ppapi_cpp.gypi @@ -310,4 +310,145 @@ ], }, ], + 'conditions': [ + ['disable_nacl!=1', { + 'targets' : [ + { + 'target_name': 'ppapi_cpp_lib', + 'type': 'none', + 'variables': { + 'nlib_target': 'libppapi_cpp.a', + 'build_glibc': 0, + 'build_newlib': 1, + 'sources': [ + 'cpp/audio.cc', + 'cpp/audio.h', + 'cpp/audio_config.cc', + 'cpp/audio_config.h', + 'cpp/completion_callback.cc', + 'cpp/completion_callback.h', + 'cpp/core.cc', + 'cpp/core.h', + 'cpp/file_io.cc', + 'cpp/file_io.h', + 'cpp/file_ref.cc', + 'cpp/file_ref.h', + 'cpp/file_system.cc', + 'cpp/file_system.h', + 'cpp/fullscreen.cc', + 'cpp/fullscreen.h', + 'cpp/graphics_2d.cc', + 'cpp/graphics_2d.h', + 'cpp/graphics_3d.cc', + 'cpp/graphics_3d.h', + 'cpp/graphics_3d_client.cc', + 'cpp/graphics_3d_client.h', + 'cpp/image_data.cc', + 'cpp/image_data.h', + 'cpp/input_event.cc', + 'cpp/input_event.h', + 'cpp/instance.cc', + 'cpp/instance.h', + 'cpp/logging.h', + 'cpp/module.cc', + 'cpp/module.h', + 'cpp/module_impl.h', + 'cpp/mouse_lock.cc', + 'cpp/mouse_lock.h', + 'cpp/non_thread_safe_ref_count.h', + 'cpp/paint_aggregator.cc', + 'cpp/paint_aggregator.h', + 'cpp/paint_manager.cc', + 'cpp/paint_manager.h', + 'cpp/point.h', + 'cpp/rect.cc', + 'cpp/rect.h', + 'cpp/resource.cc', + 'cpp/resource.h', + 'cpp/size.h', + 'cpp/url_loader.cc', + 'cpp/url_loader.h', + 'cpp/url_request_info.cc', + 'cpp/url_request_info.h', + 'cpp/url_response_info.cc', + 'cpp/url_response_info.h', + 'cpp/var.cc', + 'cpp/var.h', + + # Dev interfaces. + 'cpp/dev/buffer_dev.cc', + 'cpp/dev/buffer_dev.h', + 'cpp/dev/context_3d_dev.cc', + 'cpp/dev/context_3d_dev.h', + 'cpp/dev/directory_entry_dev.cc', + 'cpp/dev/directory_entry_dev.h', + 'cpp/dev/directory_reader_dev.cc', + 'cpp/dev/directory_reader_dev.h', + 'cpp/dev/file_chooser_dev.cc', + 'cpp/dev/file_chooser_dev.h', + 'cpp/dev/find_dev.cc', + 'cpp/dev/find_dev.h', + 'cpp/dev/font_dev.cc', + 'cpp/dev/font_dev.h', + 'cpp/dev/fullscreen_dev.cc', + 'cpp/dev/fullscreen_dev.h', + 'cpp/dev/ime_input_event_dev.cc', + 'cpp/dev/ime_input_event_dev.h', + 'cpp/dev/memory_dev.cc', + 'cpp/dev/memory_dev.h', + 'cpp/dev/printing_dev.cc', + 'cpp/dev/printing_dev.h', + 'cpp/dev/scrollbar_dev.cc', + 'cpp/dev/scrollbar_dev.h', + 'cpp/dev/selection_dev.cc', + 'cpp/dev/selection_dev.h', + 'cpp/dev/surface_3d_dev.cc', + 'cpp/dev/surface_3d_dev.h', + 'cpp/dev/text_input_dev.cc', + 'cpp/dev/text_input_dev.h', + 'cpp/dev/url_util_dev.cc', + 'cpp/dev/url_util_dev.h', + 'cpp/dev/video_capture_client_dev.cc', + 'cpp/dev/video_capture_client_dev.h', + 'cpp/dev/video_capture_dev.cc', + 'cpp/dev/video_capture_dev.h', + 'cpp/dev/video_decoder_client_dev.cc', + 'cpp/dev/video_decoder_client_dev.h', + 'cpp/dev/video_decoder_dev.cc', + 'cpp/dev/video_decoder_dev.h', + 'cpp/dev/widget_client_dev.cc', + 'cpp/dev/widget_client_dev.h', + 'cpp/dev/widget_dev.cc', + 'cpp/dev/widget_dev.h', + 'cpp/dev/zoom_dev.cc', + 'cpp/dev/zoom_dev.h', + + # Deprecated interfaces. + 'cpp/dev/scriptable_object_deprecated.h', + 'cpp/dev/scriptable_object_deprecated.cc', + + # Private interfaces. + 'cpp/private/flash_fullscreen.cc', + 'cpp/private/flash_fullscreen.h', + 'cpp/private/instance_private.cc', + 'cpp/private/instance_private.h', + 'cpp/private/var_private.cc', + 'cpp/private/var_private.h', + + # Trusted interfaces. + 'cpp/trusted/file_chooser_trusted.cc', + 'cpp/trusted/file_chooser_trusted.h', + + # Entrypoints + 'cpp/module_embedder.h', + 'cpp/ppp_entrypoints.cc', + ], + }, + 'dependencies': [ + '<(DEPTH)/native_client/tools.gyp:prep_toolchain', + ], + }, + ], + }], + ], } |