Rename test SkUserConfig files.

Since we never want to build with the fake SkUserConfig.h files
(they're only there for testing), change their name to
SkUserConfig-h.txt. Now the housekeeper will ignore it.

Also, update the generated version to match what the housekeeper
wanted. It wants my tabs to be 4 spaces, so change my tabs to 4
spaces!

NOTRY=true

Fixes buildbots.

BUG=skia:2365
R=epoger@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/221063003

git-svn-id: http://skia.googlecode.com/svn/trunk@14013 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/platform_tools/android/gyp_gen/generate_user_config.py b/platform_tools/android/gyp_gen/generate_user_config.py
index fd99ba2..1fafc1d 100644 (file)
--- a/platform_tools/android/gyp_gen/generate_user_config.py
+++ b/platform_tools/android/gyp_gen/generate_user_config.py
@@ -76,15 +76,15 @@ def generate_user_config(original_sk_user_config, target_dir, ordered_set):
 
     # do this build check for other tools that still read this header
     dst.write('#ifdef ANDROID\n')
-    dst.write('\t#include <utils/misc.h>\n')
+    dst.write('    #include <utils/misc.h>\n')
     dst.write('#endif\n\n')
 
     dst.write('#if __BYTE_ORDER == __BIG_ENDIAN\n')
-    dst.write('\t#define SK_CPU_BENDIAN\n')
-    dst.write('\t#undef  SK_CPU_LENDIAN\n')
+    dst.write('    #define SK_CPU_BENDIAN\n')
+    dst.write('    #undef  SK_CPU_LENDIAN\n')
     dst.write('#else\n')
-    dst.write('\t#define SK_CPU_LENDIAN\n')
-    dst.write('\t#undef  SK_CPU_BENDIAN\n')
+    dst.write('    #define SK_CPU_LENDIAN\n')
+    dst.write('    #undef  SK_CPU_BENDIAN\n')
     dst.write('#endif\n\n')
 
     # Now add the defines from the gyp files.

diff --git a/platform_tools/android/tests/expectations/SkUserConfig.h b/platform_tools/android/tests/expectations/SkUserConfig-h.txt
similarity index 100%
rename from platform_tools/android/tests/expectations/SkUserConfig.h
rename to platform_tools/android/tests/expectations/SkUserConfig-h.txt

diff --git a/platform_tools/android/tests/generate_user_config_tests.py b/platform_tools/android/tests/generate_user_config_tests.py
index 50f80db..503a154 100644 (file)
--- a/platform_tools/android/tests/generate_user_config_tests.py
+++ b/platform_tools/android/tests/generate_user_config_tests.py
@@ -23,7 +23,7 @@ sys.path.append(test_variables.GYP_GEN_DIR)
 from generate_user_config import generate_user_config as gen_config
 
 # Name of SkUserConfig file.
-USER_CONFIG_NAME = 'SkUserConfig.h'
+USER_CONFIG_NAME = 'SkUserConfig-h.txt'
 # Path to unchanging Dummy SkUserConfig file.
 FULL_DUMMY_PATH = os.path.join(os.path.dirname(__file__), 'inputs',
                                USER_CONFIG_NAME)

diff --git a/platform_tools/android/tests/inputs/SkUserConfig.h b/platform_tools/android/tests/inputs/SkUserConfig-h.txt
similarity index 100%
rename from platform_tools/android/tests/inputs/SkUserConfig.h
rename to platform_tools/android/tests/inputs/SkUserConfig-h.txt