Fix Android platform self-tests

platform_tools/android/tests/expectations/Android.mk

Index: platform_tools/android/tests/expectations/Android.mk
diff --git a/platform_tools/android/tests/expectations/Android.mk b/platform_tools/android/tests/expectations/Android.mk
index 66712c0327d8d5a9a63612cdf346bafa6c02c6d4..854fa6b7e0d6f0f18e5161b070adea2860943cd1 100644
--- 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

[borenet, 2014/08/18 14:06:28]

No idea what this means; it was added when I ran --rebaseline.

[scroggo, 2014/10/14 21:27:13]

FYI:

Generated by the change in https://codereview.chromium.org/420803003

I think this feature is currently not being used, but we began work on it.

 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

[borenet, 2014/08/18 14:06:28]

I don't know why this was removed when I ran --rebaseline.

[djsollen, 2014/08/18 14:08:22]

because the bench binary no longer exists (i.e. long live dm)

 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