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 ccc52b7deda71ad200f6225ab6abe00af9fdd45f..e41f985b0253378541522257c4ba4267021a7a40 100755 |
--- a/native_client_sdk/src/build_tools/build_sdk.py |
+++ b/native_client_sdk/src/build_tools/build_sdk.py |
@@ -259,6 +259,9 @@ NACL_HEADER_MAP = { |
('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': [] |
} |
@@ -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) |
@@ -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'): |