| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #ifndef SkPreConfig_DEFINED | 10 #ifndef SkPreConfig_DEFINED |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 | 46 |
| 47 /* Even if the user only defined the framework variant we still need to build | 47 /* Even if the user only defined the framework variant we still need to build |
| 48 * the default (NDK-compliant) Android code. Therefore, when attempting to | 48 * the default (NDK-compliant) Android code. Therefore, when attempting to |
| 49 * include/exclude something from the framework variant check first that we are | 49 * include/exclude something from the framework variant check first that we are |
| 50 * building for Android then check the status of the framework define. | 50 * building for Android then check the status of the framework define. |
| 51 */ | 51 */ |
| 52 #if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && !defined(SK_BUILD_FOR_ANDROID) | 52 #if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && !defined(SK_BUILD_FOR_ANDROID) |
| 53 #define SK_BUILD_FOR_ANDROID | 53 #define SK_BUILD_FOR_ANDROID |
| 54 #endif | 54 #endif |
| 55 | 55 |
| 56 | |
| 57 // USE_CHROMIUM_SKIA is defined when building Skia for the Chromium | |
| 58 // browser. | |
| 59 #if defined(USE_CHROMIUM_SKIA) | |
| 60 #define SK_BUILD_FOR_CHROMIUM | |
| 61 #endif | |
| 62 | |
| 63 ////////////////////////////////////////////////////////////////////// | 56 ////////////////////////////////////////////////////////////////////// |
| 64 | 57 |
| 65 #if !defined(SK_DEBUG) && !defined(SK_RELEASE) | 58 #if !defined(SK_DEBUG) && !defined(SK_RELEASE) |
| 66 #ifdef NDEBUG | 59 #ifdef NDEBUG |
| 67 #define SK_RELEASE | 60 #define SK_RELEASE |
| 68 #else | 61 #else |
| 69 #define SK_DEBUG | 62 #define SK_DEBUG |
| 70 #endif | 63 #endif |
| 71 #endif | 64 #endif |
| 72 | 65 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 * | 245 * |
| 253 * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute. | 246 * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute. |
| 254 */ | 247 */ |
| 255 #if SK_HAS_ATTRIBUTE(optimize) | 248 #if SK_HAS_ATTRIBUTE(optimize) |
| 256 # define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1"))) | 249 # define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1"))) |
| 257 #else | 250 #else |
| 258 # define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */ | 251 # define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */ |
| 259 #endif | 252 #endif |
| 260 | 253 |
| 261 #endif | 254 #endif |
| OLD | NEW |