up to 40.0.2214.69

[packages/chromium-browser.git] / nacl-build-irt.patch

diff --git a/nacl-build-irt.patch b/nacl-build-irt.patch
index ff7e5ded0efc31bfb5d7b83cb4b749d4e928aca1..92d762232126c521de85964daa0e51746ac3bb82 100644 (file)
--- a/nacl-build-irt.patch
+++ b/nacl-build-irt.patch
@@ -1,40 +1,17 @@
---- chromium-browser-20.0.1132.47/native_client/SConstruct~    2012-06-28 16:03:20.000000000 +0300
-+++ chromium-browser-20.0.1132.47/native_client/SConstruct     2012-07-07 01:27:46.054400799 +0300
-@@ -3329,7 +3329,7 @@
+--- chromium-browser-23.0.1271.60/src/native_client/SConstruct~        2012-10-30 21:04:38.000000000 +0200
++++ chromium-browser-23.0.1271.60/src/native_client/SConstruct 2012-11-04 17:05:10.961306382 +0200
+@@ -2744,10 +2744,10 @@
      #### ALPHABETICALLY SORTED ####
-     ], ppapi_scons_files['nonvariant_test_scons_files'])
+ ]
  
--nacl_env.Append(BUILD_SCONSCRIPTS=irt_variant_tests + nonvariant_tests)
-+#nacl_env.Append(BUILD_SCONSCRIPTS=irt_variant_tests + nonvariant_tests)
+-nacl_env.Append(BUILD_SCONSCRIPTS=nonvariant_tests)
+-nacl_env.AddChromeFilesFromGroup('nonvariant_test_scons_files')
+-nacl_env.Append(BUILD_SCONSCRIPTS=irt_variant_tests)
+-nacl_env.AddChromeFilesFromGroup('irt_variant_test_scons_files')
++#nacl_env.Append(BUILD_SCONSCRIPTS=nonvariant_tests)
++#nacl_env.AddChromeFilesFromGroup('nonvariant_test_scons_files')
++#nacl_env.Append(BUILD_SCONSCRIPTS=irt_variant_tests)
++#nacl_env.AddChromeFilesFromGroup('irt_variant_test_scons_files')
  
- # ----------------------------------------------------------
- # Possibly install an sdk by downloading it
-diff -up chromium-17.0.963.46/native_client/site_scons/site_tools/naclsdk.py.buildnacl chromium-17.0.963.46/native_client/site_scons/site_tools/naclsdk.py
---- chromium-17.0.963.46/native_client/site_scons/site_tools/naclsdk.py.buildnacl      2012-01-27 03:03:50.000000000 -0500
-+++ chromium-17.0.963.46/native_client/site_scons/site_tools/naclsdk.py        2012-02-13 17:09:38.402988894 -0500
-@@ -138,18 +138,21 @@ def _SetEnvForX86Sdk(env, sdk_path):
-   # does not run under Cygwin and does not follow Cygwin symlinks.
-   if env['TARGET_SUBARCH'] == default_subarch:
-     libsuffix = 'lib'
--    as_mode_flag = ''
--    ld_mode_flag = ''
-+    cc_mode_flag = ' -m%s -L/usr/x86_64-nacl/lib/%s' % (env['TARGET_SUBARCH'], env['TARGET_SUBARCH'])
-+    as_mode_flag = ' --%s' % env['TARGET_SUBARCH']
-+    if env['TARGET_SUBARCH'] == '64':
-+      ld_mode_flag = ' -melf64_nacl'
-+    else:
-+      ld_mode_flag = ' -melf_nacl'
-   else:
-     libsuffix = 'lib%s' % env['TARGET_SUBARCH']
-+    cc_mode_flag = '-m%s' % env['TARGET_SUBARCH']
-     as_mode_flag = '--%s' % env['TARGET_SUBARCH']
-     if env['TARGET_SUBARCH'] == '64':
-       ld_mode_flag = ' -melf64_nacl'
-     else:
-       ld_mode_flag = ' -melf_nacl'
- 
--  cc_mode_flag = '-m%s' % env['TARGET_SUBARCH']
--
-   env.Replace(# Replace header and lib paths.
-               # where to put nacl extra sdk headers
-               # TODO(robertm): switch to using the mechanism that
+ # Defines TESTS_TO_RUN_INBROWSER.
+ SConscript('tests/inbrowser_test_runner/selection.scons',