From 62f995601e5aa40d202956c9ac2f829880dcfd63 Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Fri, 29 May 2020 20:15:33 +0200 Subject: [PATCH] Android.mk: Introduce LOCAL_VENDOR_MODULE to build in AOSP tree Change path for canutils modules from system/bin to vendor/bin in the case of building in AOSP tree. https://github.com/linux-can/can-utils/pull/204 Suggested-by: Pavel Salomatov https://github.com/PsycheEYE Signed-off-by: Oliver Hartkopp --- Android.mk | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 3466260..96054d6 100644 --- a/Android.mk +++ b/Android.mk @@ -16,6 +16,7 @@ LOCAL_SRC_FILES := lib.c canframelen.c LOCAL_MODULE := libcan LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_STATIC_LIBRARY) @@ -29,6 +30,7 @@ LOCAL_SRC_FILES := libj1939.c LOCAL_MODULE := libj1939 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_STATIC_LIBRARY) @@ -44,6 +46,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libj1939 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -59,6 +62,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libj1939 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -74,6 +78,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libj1939 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -89,6 +94,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libj1939 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -104,6 +110,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libj1939 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -119,6 +126,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libcan LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -134,6 +142,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libcan LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -148,10 +157,10 @@ LOCAL_MODULE := bcmserver LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) - # # can-calc-bit-timing # @@ -163,6 +172,7 @@ LOCAL_MODULE := can-calc-bit-timing LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -178,6 +188,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libcan LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -192,6 +203,7 @@ LOCAL_MODULE := canfdtest LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -207,6 +219,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libcan LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -221,6 +234,7 @@ LOCAL_MODULE := cangw LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -236,6 +250,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libcan LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -251,6 +266,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libcan LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -265,6 +281,7 @@ LOCAL_MODULE := cansniffer LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -279,6 +296,7 @@ LOCAL_MODULE := isotpdump LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -293,6 +311,7 @@ LOCAL_MODULE := isotprecv LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -307,6 +326,7 @@ LOCAL_MODULE := isotpsend LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -321,6 +341,7 @@ LOCAL_MODULE := isotpserver LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -335,6 +356,7 @@ LOCAL_MODULE := isotpsniffer.c LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -349,6 +371,7 @@ LOCAL_MODULE := isotptun LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -363,6 +386,7 @@ LOCAL_MODULE := isotpperf LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -378,6 +402,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libcan LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -393,6 +418,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libcan LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -408,6 +434,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := libcan LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -422,6 +449,7 @@ LOCAL_MODULE := slcan_attach LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -436,6 +464,7 @@ LOCAL_MODULE := slcand LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE) @@ -450,5 +479,6 @@ LOCAL_MODULE := slcanpty LOCAL_MODULE_TAGS := optional LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/ LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS) +LOCAL_VENDOR_MODULE := true include $(BUILD_EXECUTABLE)