Update Android framework makefile to build static and shared libs

platform_tools/android/tests/expectations/Android.mk

 
 ###############################################################################
 #
 # THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
 #
 # For bugs, please contact scroggo@google.com or djsollen@google.com
 #
 ###############################################################################
 
 BASE_PATH := $(call my-dir)
-LOCAL_PATH:= $(call my-dir)
+LOCAL_PATH := $(call my-dir)
 
 ###############################################################################
 #
 # PROBLEMS WITH SKIA DEBUGGING?? READ THIS...
 #
 # The debug build results in changes to the Skia headers. This means that those
 # using libskia must also be built with the debug version of the Skia headers.
 # There are a few scenarios where this comes into play:
 #
 # (1) You're building debug code that depends on libskia.
 #   (a) If libskia is built in release, then define SK_RELEASE when building
 #       your sources.
 #   (b) If libskia is built with debugging (see step 2), then no changes are
 #       needed since your sources and libskia have been built with SK_DEBUG.
 # (2) You're building libskia in debug mode.
 #   (a) RECOMMENDED: You can build the entire system in debug mode. Do this by
 #       updating your build/core/config.mk to include -DSK_DEBUG on the line
 #       that defines COMMON_GLOBAL_CFLAGS
 #   (b) You can update all the users of libskia to define SK_DEBUG when they are
 #       building their sources.
 #
 # NOTE: If neither SK_DEBUG or SK_RELEASE are defined then Skia checks NDEBUG to
 #       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)),)
         # This should be the last -Oxxx specified in LOCAL_CFLAGS
         LOCAL_CFLAGS += -O2
 endif
 
 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
 
 LOCAL_CPPFLAGS := \
         local_cppflags
 
 LOCAL_SRC_FILES := \
         local_src_files
 
 LOCAL_SHARED_LIBRARIES := \
         local_shared_libraries
 
 LOCAL_STATIC_LIBRARIES := \
         local_static_libraries
 
 LOCAL_C_INCLUDES := \
         local_c_includes
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
         local_export_c_include_dirs
 
 LOCAL_CFLAGS += \
         -Ddefines
 
 LOCAL_MODULE_TAGS := \
         local_module_tags
 
 LOCAL_MODULE := \
-        local_module
+        local_module_static

[scroggo, 2016/02/12 15:00:31]

It looks like this is the only one that uses a tab instead of spaces. Is that
okay?

[djsollen, 2016/02/12 15:57:56]

I didn't change the behavior and looking at the code I don't see why it chooses
to use a tab here.

[scroggo, 2016/02/12 16:11:58]

My bad - they're all tabs. reitveld is just showing it differently...

 
 ifeq ($(COND), true)
 LOCAL_CFLAGS_foo += \
         local_cflags_foo
 
 LOCAL_CPPFLAGS_foo += \
         local_cppflags_foo
 
 LOCAL_SRC_FILES_foo += \
         local_src_files_foo
@@ skipping 44 matching lines @@
 
 LOCAL_CFLAGS_bar += \
         -Ddefines_bar
 
 LOCAL_MODULE_TAGS_bar += \
         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)
 
 #############################################################
 # Build the skia tools
 #
 
 # benchmark (timings)
 include $(BASE_PATH)/bench/Android.mk
 
 # diamond-master (one test to rule them all)
 include $(BASE_PATH)/dm/Android.mk