Index: third_party/tcmalloc/chromium/src/stacktrace_config.h |
diff --git a/third_party/tcmalloc/chromium/src/stacktrace_config.h b/third_party/tcmalloc/chromium/src/stacktrace_config.h |
index 72d108a8c24ec50742e1e70fd9ab7a226f707742..3310cf28be1f343c1116b4c9b4ae74c7ceada746 100644 |
--- a/third_party/tcmalloc/chromium/src/stacktrace_config.h |
+++ b/third_party/tcmalloc/chromium/src/stacktrace_config.h |
@@ -1,10 +1,10 @@ |
// Copyright (c) 2009, Google Inc. |
// All rights reserved. |
-// |
+// |
Dai Mikurube (NOT FULLTIME)
2013/05/03 08:53:00
nit: unnecessary deletion
bulach
2013/05/07 14:55:51
Done.
|
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
// met: |
-// |
+// |
// * Redistributions of source code must retain the above copyright |
// notice, this list of conditions and the following disclaimer. |
// * Redistributions in binary form must reproduce the above |
@@ -14,7 +14,7 @@ |
// * Neither the name of Google Inc. nor the names of its |
// contributors may be used to endorse or promote products derived from |
// this software without specific prior written permission. |
-// |
+// |
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
@@ -68,6 +68,11 @@ |
# define STACKTRACE_INL_HEADER "stacktrace_generic-inl.h" |
# endif |
+// The Android case |
+#elif defined(__ANDROID__) |
+ |
Dai Mikurube (NOT FULLTIME)
2013/05/03 08:53:00
nit: how about removing the empty line (line 73)?
bulach
2013/05/07 14:55:51
Done.
|
+#define STACKTRACE_INL_HEADER "stacktrace_android-inl.h" |
+ |
// The ARM case |
#elif defined(__arm__) && __GNUC__ >= 2 |
# if !defined(NO_FRAME_POINTER) |