diff options
| -rw-r--r-- | build/linux/chrome_linux.croc | 2 | ||||
| -rw-r--r-- | build/mac/chrome_mac.croc | 2 | ||||
| -rw-r--r-- | build/win/chrome_win.croc | 6 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/build/linux/chrome_linux.croc b/build/linux/chrome_linux.croc index a5982dc..c67be24 100644 --- a/build/linux/chrome_linux.croc +++ b/build/linux/chrome_linux.croc @@ -7,7 +7,7 @@ # Files/paths to include. Specify these before the excludes, since rules # are in order. { - 'regexp' : '^CHROMIUM/(base|media|net|printing|chrome|v8|webkit/glue)/', + 'regexp' : '^CHROMIUM/(base|media|net|printing|chrome|v8|webkit/glue|native_client)/', 'include' : 1, }, # Don't include subversion or mercurial SCM dirs diff --git a/build/mac/chrome_mac.croc b/build/mac/chrome_mac.croc index 91f766d..9d1d393 100644 --- a/build/mac/chrome_mac.croc +++ b/build/mac/chrome_mac.croc @@ -7,7 +7,7 @@ # Files/paths to include. Specify these before the excludes, since rules # are in order. { - 'regexp' : '^CHROMIUM/(base|media|net|printing|chrome|v8|webkit/glue)/', + 'regexp' : '^CHROMIUM/(base|media|net|printing|chrome|v8|webkit/glue|native_client)/', 'include' : 1, }, # Don't include subversion or mercurial SCM dirs diff --git a/build/win/chrome_win.croc b/build/win/chrome_win.croc index 1f12e59..3b2987a 100644 --- a/build/win/chrome_win.croc +++ b/build/win/chrome_win.croc @@ -7,7 +7,7 @@ # Files/paths to include. Specify these before the excludes, since rules # are in order. { - 'regexp' : '^CHROMIUM/(base|courgette|media|net|printing|chrome|v8|webkit/glue)/', + 'regexp' : '^CHROMIUM/(base|courgette|media|net|printing|chrome|v8|webkit/glue|native_client)/', 'include' : 1, }, # Don't include subversion or mercurial SCM dirs @@ -25,9 +25,9 @@ 'regexp' : '.*/third_party/', 'include' : 0, }, - # Don't include windows, posix, or linux specific files + # Don't include posix or linux specific files { - 'regexp' : '.*(_|/)(linux|posix|win)(\\.|_)', + 'regexp' : '.*(_|/)(linux|posix)(\\.|_)', 'include' : 0, }, diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index fc12c1d..647a8d0 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2162,6 +2162,7 @@ 'browser_tests', '../ipc/ipc.gyp:ipc_tests', '../media/media.gyp:media_unittests', + 'nacl_ui_tests', '../net/net.gyp:net_unittests', '../printing/printing.gyp:printing_unittests', # ui_tests seem unhappy on both Mac and Win when run under |