summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_android.gypi
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-19 17:08:13 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-19 17:08:13 +0000
commit3e4afdac6e30c0ff247c23667a3b6820eaf876e1 (patch)
tree96b26a106200ae9ea6e7d466c87b507e675f4708 /chrome/chrome_android.gypi
parente259cb960a413fe9e15bbe539a641126172274d9 (diff)
downloadchromium_src-3e4afdac6e30c0ff247c23667a3b6820eaf876e1.zip
chromium_src-3e4afdac6e30c0ff247c23667a3b6820eaf876e1.tar.gz
chromium_src-3e4afdac6e30c0ff247c23667a3b6820eaf876e1.tar.bz2
Revert 218286 "Set chrome_multiple_dll=1 by default on Windows i..."
chrome_frame_net_tests and nacl_integration x86-32 broke. > Set chrome_multiple_dll=1 by default on Windows in static_library > > TBR=jam@chromium.org > R=jamesr@chromium.org > BUG=237249 > > Review URL: https://chromiumcodereview.appspot.com/22909017 TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/23233003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_android.gypi')
-rw-r--r--chrome/chrome_android.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index 4c3abad..8237fac 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -19,7 +19,6 @@
'chrome_android_auxiliary',
'chromium_testshell_jni_headers',
'chrome.gyp:browser_ui',
- '../content/content.gyp:content_app_browser',
],
'sources': [
# This file must always be included in the shared_library step to ensure