summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranandc@chromium.org <anandc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-12 22:45:50 +0000
committeranandc@chromium.org <anandc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-12 22:45:50 +0000
commit1f980f38f60bff1c9552ba1c6f8f911eb2392b1e (patch)
tree2f7e04428cd49b3bbdd6e2536a15ef9cd6a52f9e
parentb823f33db488b52dbe6b74123fb27a1400acc939 (diff)
downloadchromium_src-1f980f38f60bff1c9552ba1c6f8f911eb2392b1e.zip
chromium_src-1f980f38f60bff1c9552ba1c6f8f911eb2392b1e.tar.gz
chromium_src-1f980f38f60bff1c9552ba1c6f8f911eb2392b1e.tar.bz2
Now that the fix to the build-warning seen earlier,
https://codereview.chromium.org/333443002 has landed, reactivate building browser_tests.exe for official Windows builds. BUG=379986 Review URL: https://codereview.chromium.org/328423002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276835 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--build/all.gyp1
-rw-r--r--chrome/tools/build/win/FILES.cfg5
2 files changed, 6 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 8f566b9..bb0923b 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -1083,6 +1083,7 @@
'type': 'none',
'dependencies': [
'../base/base.gyp:base_unittests',
+ '../chrome/chrome.gyp:browser_tests',
'../chrome/chrome.gyp:crash_service',
'../chrome/chrome.gyp:gcapi_dll',
'../chrome/chrome.gyp:pack_policy_templates',
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 82b4cfa..14a378a 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -30,6 +30,11 @@
# considered an error.
FILES = [
+ {
+ 'filename': 'browser_tests.exe',
+ 'buildtype': ['official'],
+ 'archive': 'browser_tests.exe',
+ },
{
'filename': 'ffmpegsumo.dll',
'buildtype': ['dev', 'official'],