Avoid redefining HAVE_ENDIAN_H and HAVE_OFF64_T on Android

skia/skia.gyp

Index: skia/skia.gyp
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 3ea140be324f6540483aa191ce552ef84109529f..4697b3cd10a64cf97d76754c41a0901e2a3c03c1 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -929,7 +929,6 @@
           'conditions': [
             [ '_toolset == "target"', {
               'defines': [
-                'HAVE_ENDIAN_H',
                 'HAVE_PTHREADS',
                 'OS_ANDROID',
                 'USE_CHROMIUM_SKIA',
@@ -960,6 +959,11 @@
                 '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
               ],
             }],
+            [ '_toolset == "target" and android_build_type == 0', {
+              'defines': [
+                'HAVE_ENDIAN_H',
+              ],
+            }],
             [ '_toolset=="host" and host_os=="linux"', {
               'sources': [
                 'ext/platform_device_linux.cc',
@@ -1070,7 +1074,6 @@
             'conditions': [
               [ '_toolset == "target"', {
                 'defines': [
-                  'HAVE_ENDIAN_H',
                   'SK_RELEASE',  # Assume platform has a release build.
                 ],
                 'dependencies!': [
@@ -1078,6 +1081,11 @@
                   '../third_party/zlib/zlib.gyp:zlib',
                 ],
               }],
+              [ '_toolset == "target" and android_build_type == 0', {
+                'defines': [
+                  'HAVE_ENDIAN_H',
+                ],
+              }],
             ],
           }],
           ['OS=="mac"', {