Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2327)

Unified Diff: build/common.gypi

Issue 18034029: [Android] Fix compilation with order_profiling=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/android/md5sum/md5sum.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 467dd745b539304700d33eded818579fdac94e9f..77d763a60d338c02afafc2e4e5921f9c317ac41b 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3325,10 +3325,17 @@
'cflags': [
'-finstrument-functions',
# Allow mmx intrinsics to inline, so that the
- # compiler can expand the intrinsics.
+ #0 compiler can expand the intrinsics.
'-finstrument-functions-exclude-file-list=mmintrin.h',
],
}],
+ ['_toolset=="target" and OS=="android"', {
+ 'cflags': [
+ # Avoids errors with current NDK:
+ # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426:3: error: argument must be a constant"
+ '-finstrument-functions-exclude-file-list=arm_neon.h',
+ ],
+ }],
],
}],
['linux_breakpad==1', {
« no previous file with comments | « no previous file | tools/android/md5sum/md5sum.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698