Generate tests/Android.mk from gyp

platform_tools/android/tests/makefile_writer_tests.py

Index: platform_tools/android/tests/makefile_writer_tests.py
diff --git a/platform_tools/android/tests/makefile_writer_tests.py b/platform_tools/android/tests/makefile_writer_tests.py
index 1b42bf37d2fa4e74d03ad681b7b063be191e3bd4..6b726579a3f148b2b47f532be994a2f031f8889f 100644
--- a/platform_tools/android/tests/makefile_writer_tests.py
+++ b/platform_tools/android/tests/makefile_writer_tests.py
@@ -21,11 +21,13 @@ import utils
 sys.path.append(test_variables.GYP_GEN_DIR)
 
 import makefile_writer
+import tool_makefile_writer
 import vars_dict_lib
 
-MAKEFILE_NAME = 'Android.mk'
+MAKEFILE_NAME = test_variables.ANDROID_MK
 REBASELINE_MSG = ('If you\'ve modified makefile_writer.py, run '
                   '"makefile_writer_tests.py --rebaseline" to rebaseline')
+TOOL_DIR = 'tool'
 
 def generate_dummy_vars_dict(name):
   """Create a VarsDict and fill it with dummy entries.
@@ -109,6 +111,16 @@ def generate_dummy_makefile(target_dir):
                                    common=common_vars_dict,
                                    deviations_from_common=deviations)
 
+def generate_dummy_tool_makefile(target_dir):
+  """Create a dummy makefile for a tool.
+
+  Args:
+      target_dir: directory in which to write the resulting Android.mk
+  """
+  vars_dict = generate_dummy_vars_dict(None)
+  tool_makefile_writer.write_tool_android_mk(target_dir=target_dir,
+                                             var_dict=vars_dict)
+
 
 class MakefileWriterTest(unittest.TestCase):
 
@@ -169,6 +181,15 @@ class MakefileWriterTest(unittest.TestCase):
 
     shutil.rmtree(outdir)
 
+  def test_tool_writer(self):
+    outdir = tempfile.mkdtemp()
+    tool_dir = os.path.join(outdir, TOOL_DIR)
+    os.mkdir(tool_dir)
+    generate_dummy_tool_makefile(tool_dir)
+
+    utils.compare_to_expectation(os.path.join(tool_dir, MAKEFILE_NAME),
+                                 os.path.join(TOOL_DIR, MAKEFILE_NAME),
+                                 self.assertTrue, REBASELINE_MSG)
 
 def main():
   loader = unittest.TestLoader()
@@ -187,6 +208,8 @@ def rebaseline():
     with open(os.path.join(utils.EXPECTATIONS_DIR, filename), 'w') as f:
       makefile_writer.write_local_vars(f, vars_dict, append, name)
 
+  generate_dummy_tool_makefile(os.path.join(utils.EXPECTATIONS_DIR, TOOL_DIR))
+
 
 if __name__ == '__main__':
   parser = argparse.ArgumentParser()