Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ppapi / native_client / src / untrusted / pnacl_irt_shim / pnacl_irt_shim.gyp

diff --git a/src/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp b/src/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
index 787d620..e251e3d 100644 (file)
--- a/src/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
+++ b/src/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
@@ -12,12 +12,16 @@
       'type': 'none',
       'variables': {
         'nlib_target': 'libpnacl_irt_shim.a',
-        'out_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/libpnacl_irt_shim.a',
-        'out_newlib32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim.a',
-        'out_newlib64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim.a',
+        'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_target)',
+        'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(nlib_target)',
+        'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(nlib_target)',
         'build_glibc': 0,
-        'build_newlib': 1,
-        'force_arm_pnacl': 1,
+        'build_newlib': 0,
+        'build_pnacl_newlib': 1,
+        'pnacl_native_biased': 1,
+        'enable_x86_32': 1,
+        'enable_x86_64': 1,
+        'enable_arm': 1,
         'sources': [
           'pnacl_shim.c',
           'shim_entry.c',
@@ -29,15 +33,6 @@
         'extra_args': [
           '--strip-debug',
         ],
-        'conditions': [
-          ['target_arch=="arm"', {
-            'compile_flags': [
-              '--pnacl-allow-translate',
-              '--pnacl-allow-native',
-              '-arch', 'arm',
-            ],
-          }],
-        ],
       },
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',