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

Unified Diff: native_client_sdk/src/build_tools/build_sdk.py

Issue 12212198: Add C++ Trace Event support to PPAPI/NaCl SDK (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: brettw feedback Created 7 years, 10 months 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 | « no previous file | native_client_sdk/src/examples/trace_events/Makefile » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 996d53947049749d24300346364b0d187991de97..cb337b5b66680a66b59ec4c3e1740be6cb5a2ea8 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -48,6 +48,7 @@ SDK_DIR = os.path.dirname(SDK_SRC_DIR)
SRC_DIR = os.path.dirname(SDK_DIR)
NACL_DIR = os.path.join(SRC_DIR, 'native_client')
OUT_DIR = os.path.join(SRC_DIR, 'out')
+BASE_DIR = os.path.join(SRC_DIR, 'base')
PPAPI_DIR = os.path.join(SRC_DIR, 'ppapi')
NACLPORTS_DIR = os.path.join(OUT_DIR, 'naclports')
@@ -286,7 +287,9 @@ HEADER_MAP = {
def InstallCommonHeaders(inc_path):
# Clean out per toolchain ppapi directory
ppapi = os.path.join(inc_path, 'ppapi')
+ base = os.path.join(inc_path, 'base')
buildbot_common.RemoveDir(ppapi)
+ buildbot_common.RemoveDir(base)
# Copy in c and c/dev headers
buildbot_common.MakeDir(os.path.join(ppapi, 'c', 'dev'))
@@ -346,6 +349,12 @@ def InstallCommonHeaders(inc_path):
buildbot_common.CopyDir(os.path.join(PPAPI_DIR, 'lib'),
os.path.join(inc_path, 'ppapi'))
+ buildbot_common.MakeDir(os.path.join(base, 'debug'))
+ buildbot_common.CopyFile(
+ os.path.join(BASE_DIR, 'debug', 'trace_event_internal.h'),
+ os.path.join(base, 'debug'))
+
+
def InstallNaClHeaders(tc_dst_inc, tc_name):
"""Copies NaCl headers to expected locations in the toolchain."""
@@ -614,6 +623,7 @@ EXAMPLE_LIST = [
'mouselock',
'pi_generator',
'sine_synth',
+ 'trace_events',
'websocket',
]
« no previous file with comments | « no previous file | native_client_sdk/src/examples/trace_events/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698