Skip to content

Commit

Permalink
Fix build error in AOSP 8.1.0 r1 tree
Browse files Browse the repository at this point in the history
Change-Id: If6f230105f5661a4544116d44c8fd48d4dc96f99
  • Loading branch information
Dees-Troy committed Dec 12, 2017
1 parent aac05c2 commit ea4efc6
Showing 1 changed file with 27 additions and 0 deletions.
27 changes: 27 additions & 0 deletions minadbd/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ea4efc6

Please sign in to comment.