Chromium Code Reviews Chromium Code Reviews
Issue 398153002:
Fix broken android framework builds where 32-bit MIPS compilers lack 64-bit __sync operators. (Closed)
Base URL: https://skia.googlesource.com/skia.git@master| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef SkPostConfig_DEFINED | 8 #ifndef SkPostConfig_DEFINED |
| 9 #define SkPostConfig_DEFINED | 9 #define SkPostConfig_DEFINED |
| 10 | 10 |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 381 | 381 |
| 382 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS | 382 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS |
| 383 # define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 | 383 # define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 |
| 384 #endif | 384 #endif |
| 385 | 385 |
| 386 ////////////////////////////////////////////////////////////////////// | 386 ////////////////////////////////////////////////////////////////////// |
| 387 | 387 |
| 388 #ifndef SK_ATOMICS_PLATFORM_H | 388 #ifndef SK_ATOMICS_PLATFORM_H |
| 389 # if defined(_MSC_VER) | 389 # if defined(_MSC_VER) |
| 390 # define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_win.h" | 390 # define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_win.h" |
| 391 # elif defined(SK_BUILD_FOR_ANDROID_FRAMWORK) && defined(__mips__) && !defined( __LP64__) | |
|
scroggo
2014/07/16 19:16:25
FRAMEWORK* (you left out an 'E')
| |
| 392 # define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_mips32.h" | |
| 391 # else | 393 # else |
| 392 # define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h" | 394 # define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h" |
| 393 # endif | 395 # endif |
| 394 #endif | 396 #endif |
| 395 | 397 |
| 396 #ifndef SK_MUTEX_PLATFORM_H | 398 #ifndef SK_MUTEX_PLATFORM_H |
| 397 # if defined(SK_BUILD_FOR_WIN) | 399 # if defined(SK_BUILD_FOR_WIN) |
| 398 # define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_win.h" | 400 # define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_win.h" |
| 399 # else | 401 # else |
| 400 # define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h" | 402 # define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h" |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 416 | 418 |
| 417 #if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB) | 419 #if defined(SK_GAMMA_EXPONENT) && defined(SK_GAMMA_SRGB) |
| 418 # error "cannot define both SK_GAMMA_EXPONENT and SK_GAMMA_SRGB" | 420 # error "cannot define both SK_GAMMA_EXPONENT and SK_GAMMA_SRGB" |
| 419 #elif defined(SK_GAMMA_SRGB) | 421 #elif defined(SK_GAMMA_SRGB) |
| 420 # define SK_GAMMA_EXPONENT (0.0f) | 422 # define SK_GAMMA_EXPONENT (0.0f) |
| 421 #elif !defined(SK_GAMMA_EXPONENT) | 423 #elif !defined(SK_GAMMA_EXPONENT) |
| 422 # define SK_GAMMA_EXPONENT (2.2f) | 424 # define SK_GAMMA_EXPONENT (2.2f) |
| 423 #endif | 425 #endif |
| 424 | 426 |
| 425 #endif // SkPostConfig_DEFINED | 427 #endif // SkPostConfig_DEFINED |
| OLD | NEW |
