summaryrefslogtreecommitdiff
path: root/chromium/build/ios
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-09 14:22:11 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-05-09 15:11:45 +0000
commit2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch)
treee75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/build/ios
parenta4f3d46271c57e8155ba912df46a05559d14726e (diff)
downloadqtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/build/ios')
-rw-r--r--chromium/build/ios/OWNERS1
-rw-r--r--chromium/build/ios/mac_build.gypi3
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/build/ios/OWNERS b/chromium/build/ios/OWNERS
index 1b3348e7911..40a68c74b17 100644
--- a/chromium/build/ios/OWNERS
+++ b/chromium/build/ios/OWNERS
@@ -1,2 +1 @@
rohitrao@chromium.org
-stuartmorgan@chromium.org
diff --git a/chromium/build/ios/mac_build.gypi b/chromium/build/ios/mac_build.gypi
index 4da21eb2535..cfde4691703 100644
--- a/chromium/build/ios/mac_build.gypi
+++ b/chromium/build/ios/mac_build.gypi
@@ -69,7 +69,8 @@
'-Ddisable_nacl=1',
# Pass through the Mac SDK version.
'-Dmac_sdk=<(mac_sdk)',
- '-Dparent_generator=<(parent_generator)'
+ '-Dparent_generator=<(parent_generator)',
+ '-DOS=mac',
],
# Rerun gyp for each of the projects needed. This is what actually