Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1837)

Unified Diff: native_client_sdk/src/build_tools/nacl_ppapi_sdk.gyp

Issue 11299081: Revert 168603 - Beginnings of moving more stuff from build_sdk.py to GYP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/data/nacl/nacl_browser_test.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/build_tools/nacl_ppapi_sdk.gyp
===================================================================
--- native_client_sdk/src/build_tools/nacl_ppapi_sdk.gyp (revision 168606)
+++ native_client_sdk/src/build_tools/nacl_ppapi_sdk.gyp (working copy)
@@ -1,130 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'targets': [
- {
- 'target_name': 'nacl_ppapi_sdk',
- 'type': 'none',
- 'dependencies': [
- '../../../native_client/build/nacl_core_sdk.gyp:nacl_core_sdk',
- '../../../ppapi/native_client/native_client.gyp:ppapi_lib',
- '../../../ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim',
- '../../../ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
- '../../../ppapi/ppapi_untrusted.gyp:ppapi_gles2_lib',
- ],
- 'conditions': [
- ['target_arch!="arm"', {
- 'copies': [
- # Newlib headers
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl/include',
- 'files': [
- '../../../native_client/src/untrusted/irt/irt.h',
- '../../../native_client/src/untrusted/irt/irt_ppapi.h',
- '../../../native_client/src/untrusted/pthread/pthread.h',
- '../../../native_client/src/untrusted/pthread/semaphore.h',
- ],
- },
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl/include/nacl',
- 'files': [
- '../../../native_client/src/untrusted/nacl/nacl_dyncode.h',
- '../../../native_client/src/untrusted/nacl/nacl_startup.h',
- '../../../native_client/src/untrusted/nacl/nacl_thread.h',
- ],
- },
- # Glibc headers
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/x86_64-nacl/include',
- 'files': [
- '../../../native_client/src/untrusted/irt/irt.h',
- '../../../native_client/src/untrusted/irt/irt_ppapi.h',
- ],
- },
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/x86_64-nacl/include/nacl',
- 'files': [
- '../../../native_client/src/untrusted/nacl/nacl_dyncode.h',
- '../../../native_client/src/untrusted/nacl/nacl_startup.h',
- '../../../native_client/src/untrusted/nacl/nacl_thread.h',
- ],
- },
- # PNaCl Newlib headers
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_pnacl/newlib/sdk/include',
- 'files': [
- '../../../native_client/src/untrusted/irt/irt.h',
- '../../../native_client/src/untrusted/irt/irt_ppapi.h',
- '../../../native_client/src/untrusted/nacl/pnacl.h',
- '../../../native_client/src/untrusted/pthread/pthread.h',
- '../../../native_client/src/untrusted/pthread/semaphore.h',
- ],
- },
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_pnacl/newlib/sdk/include/nacl',
- 'files': [
- '../../../native_client/src/untrusted/nacl/nacl_dyncode.h',
- '../../../native_client/src/untrusted/nacl/nacl_startup.h',
- '../../../native_client/src/untrusted/nacl/nacl_thread.h',
- ],
- },
- # Newlib libs
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl/lib32',
- 'files': [
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi.a',
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_cpp.a',
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_gles2.a',
- ],
- },
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib/x86_64-nacl/lib',
- 'files': [
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a',
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a',
- '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_gles2.a',
- ],
- },
- # Glibc libs
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/x86_64-nacl/lib32',
- 'files': [
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi.a',
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_cpp.a',
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32/libppapi_gles2.a',
- ],
- },
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc/x86_64-nacl/lib',
- 'files': [
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi.a',
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_cpp.a',
- '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64/libppapi_gles2.a',
- ],
- },
- # PNaCl IRT shim
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_pnacl/lib-x86-64',
- 'files': [
- '<(PRODUCT_DIR)/libpnacl_irt_shim.a',
- ],
- },
- ],
- }],
- ['target_arch=="arm"', {
- 'copies': [
- {
- 'destination': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_pnacl/lib-arm',
- 'files': [
- '<(PRODUCT_DIR)/libpnacl_irt_shim.a',
- ],
- },
- ],
- }],
- ],
- },
- ],
-}
-
« no previous file with comments | « chrome/test/data/nacl/nacl_browser_test.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698