Merge "Android.mk: add a flag to control shared/static lib"

This commit is contained in:
James Zern 2015-04-15 20:33:03 -07:00 committed by Gerrit Code Review
commit 1551d7c00b

View File

@ -184,7 +184,11 @@ clean:
@$(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)