Upstream the rest of skia diff

skia/config/SkUserConfig.h

 /*
  * Copyright (C) 2006 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 168 matching lines @@
 SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
                               const char* format, ...);
 
 // Marking the debug print as "fatal" will cause a debug break, so we don't need
 // a separate crash call here.
 #define SK_DEBUGBREAK(cond) do { if (!(cond)) { \
     SkDebugf_FileLine(__FILE__, __LINE__, true, \
     "%s:%d: failed assertion \"%s\"\n", \
     __FILE__, __LINE__, #cond); } } while (false)
 
+#if !defined(ANDROID)   // On Android, we use the skia default settings

[Nico, 2012/07/24 01:20:27]

Nit: trailing .

[michaelbai, 2012/07/24 01:37:47]

Done.

 // All little-endian Chrome platforms agree:  BGRA is the optimal pixel layout.

[Nico, 2012/07/24 01:20:27]

remove this comment

[michaelbai, 2012/07/24 01:37:47]

Done.

 #define SK_A32_SHIFT    24
 #define SK_R32_SHIFT    16
 #define SK_G32_SHIFT    8
 #define SK_B32_SHIFT    0
+#endif
 
 #if defined(SK_BUILD_FOR_WIN32)
 
 #define SK_BUILD_FOR_WIN
 
 // VC8 doesn't support stdint.h, so we define those types here.
 #define SK_IGNORE_STDINT_DOT_H
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef short int16_t;
@@ skipping 38 matching lines @@
 // assertion.
 #define SK_CRASH() SkDebugf_FileLine(__FILE__, __LINE__, true, "SK_CRASH")
 
 // Uncomment the following line to forward skia trace events to Chrome
 // tracing.
 // #define SK_USER_TRACE_INCLUDE_FILE "skia/ext/skia_trace_shim.h"
 
 // ===== End Chrome-specific definitions =====
 
 #endif