← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/disable_gn.patch

  • Committer: Chad Miller
  • Date: 2014-02-21 00:14:13 UTC
  • Revision ID: chad.miller@canonical.com-20140221001413-xeloyqxq52xndv72
* Upstream release 33.0.1750.115.
* debian/rules, debian/control: Switch to using ninja instead of make to
  build. Switch from CDBS to dh. Remove many old hacks.
* debian/patches/disable_gn.patch: disable broken GN before build. Temporary
  hack.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/disable_gn.patch
 
1
Index: dev.trusty/src/build/gyp_chromium
 
2
===================================================================
 
3
--- dev.trusty.orig/src/build/gyp_chromium      2013-12-08 09:29:16.680693231 -0500
 
4
+++ dev.trusty/src/build/gyp_chromium   2013-12-08 09:29:23.004915702 -0500
 
5
@@ -418,8 +418,8 @@
 
6
     args.append('--check')
 
7
 
 
8
   supplemental_includes = GetSupplementalFiles()
 
9
 
 
10
-  if not RunGN(supplemental_includes):
 
11
-    sys.exit(1)
 
12
+#  if not RunGN(supplemental_includes):
 
13
+#    sys.exit(1)
 
14
 
 
15
   args.extend(
 
16
       ['-I' + i for i in additional_include_files(supplemental_includes, args)])
 
17