Skip to content

Commit

Permalink
[NaCl SDK] Add irt_ppapi.h to the bionic SDK.
Browse files Browse the repository at this point in the history
This was not included, but was referenced by ps_main.c

BUG=none
R=sbc@google.com, sbc@chromium.org, noelallen@chromium.org

Review URL: https://codereview.chromium.org/563863003

Cr-Commit-Position: refs/heads/master@{#294487}
  • Loading branch information
binji committed Sep 11, 2014
1 parent e4654f7 commit 7275643
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions native_client_sdk/src/build_tools/build_sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,9 @@ def BuildStepUntarToolchains(pepperdir, toolchains):
('native_client/src/untrusted/valgrind/dynamic_annotations.h', 'nacl/'),
('ppapi/nacl_irt/public/irt_ppapi.h', ''),
],
'bionic': [
('ppapi/nacl_irt/public/irt_ppapi.h', ''),
],
'host': []
}

Expand Down Expand Up @@ -565,6 +568,7 @@ def BuildStepBuildToolchains(pepperdir, toolchains):
glibcdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_glibc')
armdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_newlib')
pnacldir = os.path.join(pepperdir, 'toolchain', platform + '_pnacl')
bionicdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_bionic')

if set(toolchains) & set(['glibc', 'newlib']):
GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR)
Expand All @@ -586,6 +590,10 @@ def BuildStepBuildToolchains(pepperdir, toolchains):
InstallNaClHeaders(GetToolchainNaClInclude('newlib', armdir, 'arm'),
'arm')

if 'bionic' in toolchains:
InstallNaClHeaders(GetToolchainNaClInclude('bionic', bionicdir, 'arm'),
'bionic')

if 'pnacl' in toolchains:
# NOTE: For ia32, gyp builds both x86-32 and x86-64 by default.
for arch in ('ia32', 'arm'):
Expand Down

0 comments on commit 7275643

Please sign in to comment.