Fix Android platform self-tests

Remove things related to no-longer-existing unittests, run makefile_writer_tests --rebaseline

BUG=skia:2843
R=djsollen@google.com, scroggo@google.com

Author: borenet@google.com

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

diff --git a/platform_tools/android/tests/expectations/Android.mk b/platform_tools/android/tests/expectations/Android.mk
index 66712c0..854fa6b 100644 (file)
--- a/platform_tools/android/tests/expectations/Android.mk
+++ b/platform_tools/android/tests/expectations/Android.mk
@@ -33,6 +33,7 @@ LOCAL_PATH:= $(call my-dir)
 ###############################################################################
 
 include $(CLEAR_VARS)
+LOCAL_FDO_SUPPORT := true
 LOCAL_ARM_MODE := thumb
 ifeq ($(TARGET_ARCH),arm)
        ifeq ($(ARCH_ARM_HAVE_VFP),true)
@@ -150,14 +151,10 @@ include $(BUILD_SHARED_LIBRARY)
 #
 
 # benchmark (timings)
-include $(BASE_PATH)/bench/Android.mk
 include $(BASE_PATH)/tools/Android.mk
 
 # golden-master (fidelity / regression test)
 include $(BASE_PATH)/gm/Android.mk
 
-# unit-tests
-include $(BASE_PATH)/tests/Android.mk
-
 # diamond-master (one test to rule them all)
 include $(BASE_PATH)/dm/Android.mk

diff --git a/platform_tools/android/tests/gyp_to_android_tests.py b/platform_tools/android/tests/gyp_to_android_tests.py
index 512ce36..434afd1 100644 (file)
--- a/platform_tools/android/tests/gyp_to_android_tests.py
+++ b/platform_tools/android/tests/gyp_to_android_tests.py
@@ -37,11 +37,6 @@ class AndroidMkCreationTest(unittest.TestCase):
                                       test_variables.ANDROID_MK)
     self.assertTrue(os.path.exists(path_to_android_mk))
 
-    # In addition, there should be an 'Android.mk' inside /tests/
-    path_to_tests_android_mk = os.path.join(self.__tmp_dir, 'tests',
-                                            test_variables.ANDROID_MK)
-    self.assertTrue(os.path.exists(path_to_tests_android_mk))
-
   def tearDown(self):
     # Remove self.__tmp_dir, which is no longer needed.
     shutil.rmtree(self.__tmp_dir)