diff options
-rw-r--r-- | remote-processor/Android.mk | 53 |
1 files changed, 37 insertions, 16 deletions
diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk index 79f5059..bef8f90 100644 --- a/remote-processor/Android.mk +++ b/remote-processor/Android.mk @@ -1,10 +1,9 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) +#################### +# Common definitions -LOCAL_SRC_FILES := \ +COMMON_SRC_FILES := \ Socket.cpp \ ListeningSocket.cpp \ ConnectionSocket.cpp \ @@ -14,26 +13,48 @@ LOCAL_SRC_FILES := \ RemoteProcessorServer.cpp \ RemoteProcessorServerBuilder.cpp -LOCAL_MODULE := libremote-processor +COMMON_MODULE := libremote-processor +COMMON_MODULE_TAGS := optional -LOCAL_MODULE_TAGS := optional +COMMON_ERROR_FLAGS := -Wno-non-virtual-dtor -TARGET_ERROR_FLAGS += -Wno-non-virtual-dtor +COMMON_LDLIBS := -lpthread -LOCAL_C_INCLUDES += +############################# +# Target build -LOCAL_C_INCLUDES += \ - external/stlport/stlport/ \ - bionic/libstdc++ \ - bionic/ +include $(CLEAR_VARS) -LOCAL_C_INCLUDES += +LOCAL_SRC_FILES := $(COMMON_SRC_FILES) -LOCAL_SHARED_LIBRARIES := libstlport libicuuc -LOCAL_STATIC_LIBRARIES := +LOCAL_MODULE := $(COMMON_MODULE) +LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS) + +TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS) + +LOCAL_C_INCLUDES += \ + external/stlport/stlport/ \ + bionic/libstdc++ \ + bionic/ -LOCAL_LDLIBS += +LOCAL_SHARED_LIBRARIES := libstlport +LOCAL_LDLIBS += $(COMMON_LDLIBS) include $(BUILD_SHARED_LIBRARY) +############################## +# Host build + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(COMMON_SRC_FILES) + +LOCAL_MODULE := $(COMMON_MODULE) +LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS) + +TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS) + +LOCAL_LDLIBS += $(COMMON_LDLIBS) + +include $(BUILD_HOST_SHARED_LIBRARY) |