Merge pull request #374 from marckleinebudde/fix-android

Android.mk: fix compilation of can-calc-bit-timing
2022-08-17 11:54:50 +02:00 · 2022-08-17 11:54:50 +02:00 · f020f563e7
parent a44238c9e2 e0945d867e
commit f020f563e7
2 changed files with 1 additions and 2 deletions
--- a/Android.mk
+++ b/Android.mk
@ -181,7 +181,7 @@ include $(BUILD_EXECUTABLE)

 include $(CLEAR_VARS)

-LOCAL_SRC_FILES := can-calc-bit-timing.c
+LOCAL_SRC_FILES := calc-bit-timing/can-calc-bit-timing.c
 LOCAL_MODULE := can-calc-bit-timing
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -46,7 +46,6 @@ set(PROGRAMS_J1939
 set(PROGRAMS
    ${PROGRAMS_CANLIB}
    bcmserver
-    can-calc-bit-timing
    canfdtest
    cangw
    cansniffer