From ea4efc6d200a493084a90e80d9eb0dc5ffa96cdb Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Tue, 12 Dec 2017 16:24:28 -0600 Subject: Fix build error in AOSP 8.1.0 r1 tree Change-Id: If6f230105f5661a4544116d44c8fd48d4dc96f99 --- minadbd/Android.mk | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/minadbd/Android.mk b/minadbd/Android.mk index fb90f6120..40e0519af 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -38,6 +38,33 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) +LOCAL_SRC_FILES := \ + fuse_adb_provider.cpp \ + ../fuse_sideload.cpp \ + minadbd.cpp \ + minadbd_services.cpp \ + +LOCAL_CLANG := true +LOCAL_MODULE := libminadbd +LOCAL_CFLAGS := $(minadbd_cflags) +LOCAL_CONLY_FLAGS := -Wimplicit-function-declaration +LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. system/core/adb +LOCAL_WHOLE_STATIC_LIBRARIES := libadbd +LOCAL_STATIC_LIBRARIES := libbase liblog libcutils libc + +ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) + LOCAL_C_INCLUDES += $(LOCAL_PATH)/libmincrypt/includes + LOCAL_SHARED_LIBRARIES += libmincrypttwrp + LOCAL_CFLAGS += -DUSE_MINCRYPT +else + LOCAL_SHARED_LIBRARIES += libcrypto \ + $(if $(WITH_CRYPTO_UTILS),libcrypto_utils) +endif + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + LOCAL_CLANG := true LOCAL_MODULE := minadbd_test LOCAL_SRC_FILES := fuse_adb_provider_test.cpp -- cgit v1.2.3