Update Android framework makefile to build static and shared libs

platform_tools/android/tests/makefile_writer_tests.py

 #!/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.
 
 """
 Test makefile_writer.py
 """
@@ skipping 93 matching lines @@
   common_vars_dict = generate_dummy_vars_dict(None)
 
   deviation_params = [('foo', 'COND'), ('bar', None)]
   deviations = [generate_dummy_vars_dict_data(name, condition)
                 for (name, condition) in deviation_params]
 
   makefile_writer.write_android_mk(target_dir=target_dir,
                                    common=common_vars_dict,
                                    deviations_from_common=deviations)
 
+def generate_dummy_static_deps_makefile(target_dir):
+  """Create a dummy makefile that prints out the static dependencies.
+
+  Use dummy values unrelated to any gyp files. Its output should remain the
+  same unless/until makefile_writer.write_static_deps_mk changes.
+
+  Args:
+    target_dir: directory in which to write the resulting file
+  """
+  common_vars_dict = generate_dummy_vars_dict(None)
+
+  deviation_params = [('foo', 'COND'), ('bar', None)]
+  deviations = [generate_dummy_vars_dict_data(name, condition)
+                for (name, condition) in deviation_params]
+
+  makefile_writer.write_static_deps_mk(target_dir=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)
 
@@ skipping 50 matching lines @@
 
   def test_write_android_mk(self):
     outdir = tempfile.mkdtemp()
     generate_dummy_makefile(outdir)
 
     utils.compare_to_expectation(os.path.join(outdir, MAKEFILE_NAME),
                                  MAKEFILE_NAME, self.assertTrue, REBASELINE_MSG)
 
     shutil.rmtree(outdir)
 
+  def test_include_static_deps_writer(self):
+    outdir = tempfile.mkdtemp()
+    generate_dummy_static_deps_makefile(outdir)
+
+    filename = test_variables.STATIC_DEPS_MK
+    utils.compare_to_expectation(os.path.join(outdir, filename),
+                                 filename, self.assertTrue, REBASELINE_MSG)
+
   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()
   suite = loader.loadTestsFromTestCase(MakefileWriterTest)
   results = unittest.TextTestRunner(verbosity=2).run(suite)
   print repr(results)
   if not results.wasSuccessful():
     raise Exception('failed one or more unittests')
 
 
 def rebaseline():
   generate_dummy_makefile(utils.EXPECTATIONS_DIR)
 
   vars_dict = generate_dummy_vars_dict(None)
   for (filename, append, name) in generate_write_local_vars_params():
     with open(os.path.join(utils.EXPECTATIONS_DIR, filename), 'w') as f:
       makefile_writer.write_local_vars(f, vars_dict, append, name)
 
+  generate_dummy_static_deps_makefile(utils.EXPECTATIONS_DIR)
   generate_dummy_tool_makefile(os.path.join(utils.EXPECTATIONS_DIR, TOOL_DIR))
 
 
 if __name__ == '__main__':
   parser = argparse.ArgumentParser()
   parser.add_argument('-r', '--rebaseline', help='Rebaseline expectations.',
                       action='store_true')
   args = parser.parse_args()
 
   if args.rebaseline:
     rebaseline()
   else:
     main()