Updates to Android.mk generation.

Generate SkUserConfig.
Include arm64 as another build flavor.
Add tests.

gyp/common_conditions.gypi:
Add conditions for Android framework. These will get written into the generated SkUserConfig.

include/core/SkUserConfig.h:
Generated version that will ultimately be checked into Android (but not here).

platform_tools/android/bin/gyp_to_android.py:
Generate SkUserConfig.
Add arm64 (note that arm64 is not currently respected by our gyp files, so it results in use _none.cpp for the various opts).
Reset the common defines, which are now passed to the generated SkUserConfig.

platform_tools/android/gyp_gen/generate_user_config.py:
New script to generate SkUserConfig.h.

platform_tools/android/gyp_gen/gypd_parser.py:
Fix a lint error (unused import).

platform_tools/android/gyp_gen/makefile_writer.py:
Append any remaining DEFINES to LOCAL_CFLAGS (previously this was done during parsing).
Add a warning for arm64 (corresponds to downstream Android.mk).

platform_tools/android/gyp_gen/vars_dict_lib.py:
Add OrderedSet.reset().
Add DEFINES to VarsDict.

platform_tools/android/tests/expectations/:
Add and update expectations files.

platform_tools/android/tests/generate_user_config_tests.py:
New test for generate_user_config.py

platform_tools/android/tests/inputs/SkUserConfig.h:
Input to the new test, so we don't have to update the expectations each time the real SkUserConfig.h changes.

platform_tools/android/tests/makefile_writer_tests.py:
Add a way to rebaseline test_write_local_vars, which has changed.
Refactor EXPECTATIONS_DIR and compare_files into a separate file for sharing with generate_user_config_tests.py.

platform_tools/android/tests/utils.py:
Common code for tests.

platform_tools/android/tests/var_dict_tests.py:
Use a for loop to test the new key (DEFINES) and future proof this test to test any new keys in the future.

BUG=skia:1975
R=djsollen@google.com, halcanary@google.com

Author: scroggo@google.com

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

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

1 files changed, 36 insertions, 0 deletions

diff --git a/platform_tools/android/tests/utils.py b/platform_tools/android/tests/utils.py
new file mode 100644
index 0000000000..0a969964b5
--- /dev/null
+++ b/platform_tools/android/tests/utils.py
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+
+# Copyright 2014 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""
+Common code for tests.
+"""
+import filecmp
+import os
+
+EXPECTATIONS_DIR = os.path.join(os.path.dirname(__file__), 'expectations')
+
+def compare_to_expectation(actual_name, expectation_name, assert_true,
+                           msg=None):
+  """Check that a generated file matches its expectation in EXPECTATIONS_DIR.
+
+  Assert that the generated file and expectation file are identical.
+
+  Args:
+      actual_name: Full path to the test file.
+      expectation_name: Basename of the expectations file within which
+          to compare. The file is expected to be in
+          platform_tools/android/tests/expectations.
+      assert_true: function for asserting a statement is True
+
+      Args:
+          condition: statement to check for True.
+          msg: message to print if the files are not equal.
+
+      msg: Message to pass to assert_true.
+  """
+  full_expectations_path = os.path.join(EXPECTATIONS_DIR, expectation_name)
+  assert_true(filecmp.cmp(actual_name, full_expectations_path), msg)