diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2015-09-15 13:07:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-15 20:08:05 +0000 |
| commit | 5e33f71d26d9164716df878acb72f18f041d0f77 (patch) | |
| tree | a93eb279deca15675e7e60e8d411f47ea8df3548 | |
| parent | 71d86e7201cb32d70a5e1f91e6851d30ffe81a62 (diff) | |
| download | chromium_src-5e33f71d26d9164716df878acb72f18f041d0f77.zip chromium_src-5e33f71d26d9164716df878acb72f18f041d0f77.tar.gz chromium_src-5e33f71d26d9164716df878acb72f18f041d0f77.tar.bz2 | |
Remove remnants of non-Android order_profiling logic
Support for order_profiling was removed for non-Android in
https://codereview.chromium.org/296793004
This CL removes a couple of spots that that CL missed.
BUG=531278
TEST=None
R=pasko
Review URL: https://codereview.chromium.org/1341663002
Cr-Commit-Position: refs/heads/master@{#348971}
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index c0e4e4f..199b079 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -4591,7 +4591,7 @@ '<(DEPTH)/buildtools/third_party/libc++/libc++.gyp:libcxx_proxy', ], }], - ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")', { + ['order_profiling!=0 and OS=="android"', { 'target_conditions' : [ # crazy_linker has an upstream gyp file we can't edit, and we # don't want to instrument it. @@ -4604,7 +4604,7 @@ ], 'defines': ['CYGPROFILE_INSTRUMENTATION'], }], - ['_toolset=="target" and OS=="android"', { + ['_toolset=="target"', { '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" diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index c64b27d..5d6ed4e 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -87,11 +87,6 @@ 'INFOPLIST_FILE': 'app/app-Info.plist', }, 'conditions': [ - ['order_profiling!=0 and (chromeos==1 or OS=="linux")', { - 'dependencies' : [ - '../tools/cygprofile/cygprofile.gyp:cygprofile', - ], - }], ['order_text_section!=""', { 'target_conditions' : [ ['_toolset=="target"', { |