← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/dont-assume-cross-compile-on-arm.patch

  • Committer: Chad Miller
  • Date: 2013-04-10 17:26:30 UTC
  • Revision ID: chad.miller@canonical.com-20130410172630-0ggoeum29w1f8hmi
Update webapps patches.

Ignore src and quilt files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/dont-assume-cross-compile-on-arm.patch
1
 
Index: chromium-browser-25.0.1364.160/src/build/common.gypi
2
 
===================================================================
3
 
--- chromium-browser-25.0.1364.160.orig/src/build/common.gypi   2013-03-08 18:00:18.000000000 +0000
4
 
+++ chromium-browser-25.0.1364.160/src/build/common.gypi        2013-03-15 22:04:52.080682002 +0000
5
 
@@ -582,16 +582,6 @@
 
1
--- a/src/build/common.gypi
 
2
+++ b/src/build/common.gypi
 
3
@@ -609,17 +609,6 @@
6
4
           'enable_settings_app%': 0,
7
5
         }],
8
6
 
16
14
-          # incorrect results when passed to pkg-config
17
15
-          'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
18
16
-        }], # OS=="linux" and target_arch=="arm" and chromeos==0
19
 
       ],
20
 
 
21
 
       # Set this to 1 to use the Google-internal file containing
 
17
-
 
18
         ['target_arch=="mipsel"', {
 
19
           'sysroot': '<!(cd <(DEPTH) && pwd -P)/native_client/toolchain/linux_mips-trusted/sysroot',
 
20
         }],