Updates to Android.mk generation.

platform_tools/android/tests/expectations/SkUserConfig.h

Index: platform_tools/android/tests/expectations/SkUserConfig.h
diff --git a/platform_tools/android/tests/expectations/SkUserConfig.h b/platform_tools/android/tests/expectations/SkUserConfig.h
new file mode 100644
index 0000000000000000000000000000000000000000..57827ad846cd194db305e16f6dfef1ed6fb5d473
--- /dev/null
+++ b/platform_tools/android/tests/expectations/SkUserConfig.h
@@ -0,0 +1,43 @@
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
+//
+// This file contains Skia's upstream include/config/SkUserConfig.h as a
+// reference, followed by the actual defines set for Android.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/*
+ *  Unchanging SkUserConfig.h for testing generate_user_config.
+ */
+
+// Android defines:
+#ifndef SkUserConfig_Android_DEFINED
+#define SkUserConfig_Android_DEFINED
+#ifdef ANDROID
+	#include <utils/misc.h>
+#endif
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+	#define SK_CPU_BENDIAN
+	#undef  SK_CPU_LENDIAN
+#else
+	#define SK_CPU_LENDIAN
+	#undef  SK_CPU_BENDIAN
+#endif
+
+#define SK_BUILD_FOR_ANDROID
+#define SK_BUILD_FOR_ANDROID_FRAMEWORK
+#define SK_SCALAR_IS_FLOAT
+#define foo
+#define bar
+
+#endif // SkUserConfig_Android_DEFINED