Update Android framework makefile to build static and shared libs

platform_tools/android/tests/expectations/skia_static_deps.mk

Index: platform_tools/android/tests/expectations/skia_static_deps.mk
diff --git a/platform_tools/android/tests/expectations/skia_static_deps.mk b/platform_tools/android/tests/expectations/skia_static_deps.mk
new file mode 100644
index 0000000000000000000000000000000000000000..e7cd24672b60e4547c2a65939f215a41f91763d3
--- /dev/null
+++ b/platform_tools/android/tests/expectations/skia_static_deps.mk
@@ -0,0 +1,41 @@
+
+###############################################################################
+#
+# THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
+#
+# For bugs, please contact scroggo@google.com or djsollen@google.com
+#
+###############################################################################
+
+
+###############################################################################
+# 
+# This file contains the shared and static dependencies needed by any target 
+# that attempts to statically link Skia (i.e. libskia_static build target).
+#
+# This is a workaround for the fact that the build system does not add these
+# transitive dependencies when it attempts to link libskia_static into another
+# library.
+#
+###############################################################################
+ifeq ($(COND), true)
+LOCAL_SHARED_LIBRARIES += \
+	local_shared_libraries_foo
+
+LOCAL_STATIC_LIBRARIES += \
+	local_static_libraries_foo
+
+endif
+
+LOCAL_SHARED_LIBRARIES += \
+	local_shared_libraries_bar
+
+LOCAL_STATIC_LIBRARIES += \
+	local_static_libraries_bar
+
+LOCAL_SHARED_LIBRARIES += \
+	local_shared_libraries
+
+LOCAL_STATIC_LIBRARIES += \
+	local_static_libraries
+