Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8b68c45 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "add static dependency on liblog"

parents 530a7fd8 0d6e7315

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/framework-res_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(HOST_OUT)/obj/STATIC_LIBRARIES/libandroidfw_intermediates/import_includes)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

libs/androidfw/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ LOCAL_CFLAGS += -DSTATIC_ANDROIDFW_FOR_TOOLS 
LOCAL_C_INCLUDES := \

	external/zlib



LOCAL_STATIC_LIBRARIES := liblog



include $(BUILD_HOST_STATIC_LIBRARY)