Update Android framework makefile to build static and shared libs

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 c7ac190422275954f2ec0fa1ec493e9fbf7c4edf..861784a22c6a454b8501dbf857f913a2b1082e4a 100644
--- a/platform_tools/android/tests/expectations/Android.mk
+++ b/platform_tools/android/tests/expectations/Android.mk
@@ -34,6 +34,14 @@ LOCAL_PATH:= $(call my-dir)
 #       determine which build type to use.
 ###############################################################################
 
+###############################################################################
+# STATIC LIBRARY
+#
+# This target is only to be used internally for only one of two purposes...
+#  (1) statically linking into testing frameworks
+#  (2) as an inclusion target for the libskia.so shared library
+###############################################################################
+
 include $(CLEAR_VARS)
 LOCAL_FDO_SUPPORT := true
 ifneq ($(strip $(TARGET_FDO_CFLAGS)),)
@@ -45,10 +53,6 @@ LOCAL_ARM_MODE := thumb
 # used for testing
 #LOCAL_CFLAGS += -g -O0
 
-ifeq ($(NO_FALLBACK_FONT),true)
-	LOCAL_CFLAGS += -DNO_FALLBACK_FONT
-endif
-
 LOCAL_CFLAGS += \
 	local_cflags
 
@@ -77,7 +81,7 @@ LOCAL_MODULE_TAGS := \
 	local_module_tags
 
 LOCAL_MODULE := \
-	local_module
+	local_module_static
 
 ifeq ($(COND), true)
 LOCAL_CFLAGS_foo += \
@@ -142,6 +146,22 @@ LOCAL_MODULE_TAGS_bar += \
 LOCAL_MODULE_bar += \
 	local_module_bar
 
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+include $(BUILD_STATIC_LIBRARY)
+
+
+###############################################################################
+# SHARED LIBRARY
+###############################################################################
+
+include $(CLEAR_VARS)
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE := local_module
+LOCAL_WHOLE_STATIC_LIBRARIES := local_module_static
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+	local_export_c_include_dirs
+
+include $(BASE_PATH)/skia_static_deps.mk
 include $(BUILD_SHARED_LIBRARY)
 
 #############################################################