ref: 1551d7c00b49e5ae05ffda739b675b8ffdeebb1d
parent: 14e7203e7be3db5f9e7e4640d4b44afbb69db2cb
parent: b815f3a977c83ccb1c2733b27bf6ab6612a7f6f5
author: James Zern <[email protected]>
date: Wed Apr 15 16:33:03 EDT 2015
Merge "Android.mk: add a flag to control shared/static lib"
--- a/build/make/Android.mk
+++ b/build/make/Android.mk
@@ -184,7 +184,11 @@
@$(RM) -r $(ASM_CNV_PATH)
@$(RM) $(CLEAN-OBJS)
-include $(BUILD_SHARED_LIBRARY)
+ifeq ($(ENABLE_SHARED),1)
+ include $(BUILD_SHARED_LIBRARY)
+else
+ include $(BUILD_STATIC_LIBRARY)
+endif
ifeq ($(CONFIG_RUNTIME_CPU_DETECT),yes)
$(call import-module,cpufeatures)