From 500c64aef290348a1c833983b7297bdc3f3262c4 Mon Sep 17 00:00:00 2001 From: Chris Dickens Date: Mon, 30 Mar 2020 13:21:04 -0700 Subject: android: Update makefiles to include recent autobuild changes Add C11, thread and visibility compiler flags. Enable additional warnings and errors. Unify spacing amongst the makefiles. Signed-off-by: Chris Dickens --- android/jni/Android.mk | 2 +- android/jni/Application.mk | 16 ++++++++++++++ android/jni/examples.mk | 52 ++++++++++++++++++++++++---------------------- android/jni/libusb.mk | 12 ++++++----- android/jni/tests.mk | 30 ++++++-------------------- libusb/version_nano.h | 2 +- 6 files changed, 58 insertions(+), 56 deletions(-) diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 6a32b50..29146b2 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/libusb.mk include $(LOCAL_PATH)/examples.mk diff --git a/android/jni/Application.mk b/android/jni/Application.mk index f972a9e..12e57d1 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -18,6 +18,22 @@ APP_ABI := all +APP_CFLAGS := \ + -std=gnu11 \ + -Wall \ + -Wextra \ + -Wshadow \ + -Wunused \ + -Wwrite-strings \ + -Werror=format-security \ + -Werror=implicit-function-declaration \ + -Werror=implicit-int \ + -Werror=init-self \ + -Werror=missing-prototypes \ + -Werror=strict-prototypes \ + -Werror=undef \ + -Werror=unintialized + # Workaround for MIPS toolchain linker being unable to find liblog dependency # of shared object in NDK versions at least up to r9. # diff --git a/android/jni/examples.mk b/android/jni/examples.mk index 05609cc..74139ce 100644 --- a/android/jni/examples.mk +++ b/android/jni/examples.mk @@ -16,119 +16,121 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # -LOCAL_PATH:= $(call my-dir) -LIBUSB_ROOT_REL:= ../.. -LIBUSB_ROOT_ABS:= $(LOCAL_PATH)/../.. +LOCAL_PATH := $(call my-dir) +LIBUSB_ROOT_REL := ../.. +LIBUSB_ROOT_ABS := $(LOCAL_PATH)/../.. -# listdevs +# dpfp include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(LIBUSB_ROOT_REL)/examples/listdevs.c + $(LIBUSB_ROOT_REL)/examples/dpfp.c LOCAL_C_INCLUDES += \ $(LIBUSB_ROOT_ABS) LOCAL_SHARED_LIBRARIES += libusb1.0 -LOCAL_MODULE:= listdevs +LOCAL_MODULE := dpfp include $(BUILD_EXECUTABLE) -# xusb +# dpfp_threaded include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(LIBUSB_ROOT_REL)/examples/xusb.c + $(LIBUSB_ROOT_REL)/examples/dpfp_threaded.c LOCAL_C_INCLUDES += \ $(LIBUSB_ROOT_ABS) +LOCAL_CFLAGS := -pthread + LOCAL_SHARED_LIBRARIES += libusb1.0 -LOCAL_MODULE:= xusb +LOCAL_MODULE := dpfp_threaded include $(BUILD_EXECUTABLE) -# hotplugtest +# fxload include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(LIBUSB_ROOT_REL)/examples/hotplugtest.c + $(LIBUSB_ROOT_REL)/examples/ezusb.c \ + $(LIBUSB_ROOT_REL)/examples/fxload.c LOCAL_C_INCLUDES += \ $(LIBUSB_ROOT_ABS) LOCAL_SHARED_LIBRARIES += libusb1.0 -LOCAL_MODULE:= hotplugtest +LOCAL_MODULE := fxload include $(BUILD_EXECUTABLE) -# fxload +# hotplugtest include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(LIBUSB_ROOT_REL)/examples/fxload.c \ - $(LIBUSB_ROOT_REL)/examples/ezusb.c + $(LIBUSB_ROOT_REL)/examples/hotplugtest.c LOCAL_C_INCLUDES += \ $(LIBUSB_ROOT_ABS) LOCAL_SHARED_LIBRARIES += libusb1.0 -LOCAL_MODULE:= fxload +LOCAL_MODULE := hotplugtest include $(BUILD_EXECUTABLE) -# sam3u_benchmake +# listdevs include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(LIBUSB_ROOT_REL)/examples/sam3u_benchmark.c + $(LIBUSB_ROOT_REL)/examples/listdevs.c LOCAL_C_INCLUDES += \ $(LIBUSB_ROOT_ABS) LOCAL_SHARED_LIBRARIES += libusb1.0 -LOCAL_MODULE:= sam3u_benchmark +LOCAL_MODULE := listdevs include $(BUILD_EXECUTABLE) -# dpfp +# sam3u_benchmark include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(LIBUSB_ROOT_REL)/examples/dpfp.c + $(LIBUSB_ROOT_REL)/examples/sam3u_benchmark.c LOCAL_C_INCLUDES += \ $(LIBUSB_ROOT_ABS) LOCAL_SHARED_LIBRARIES += libusb1.0 -LOCAL_MODULE:= dpfp +LOCAL_MODULE := sam3u_benchmark include $(BUILD_EXECUTABLE) -# dpfp_threaded +# xusb include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(LIBUSB_ROOT_REL)/examples/dpfp_threaded.c + $(LIBUSB_ROOT_REL)/examples/xusb.c LOCAL_C_INCLUDES += \ $(LIBUSB_ROOT_ABS) LOCAL_SHARED_LIBRARIES += libusb1.0 -LOCAL_MODULE:= dpfp_threaded +LOCAL_MODULE := xusb include $(BUILD_EXECUTABLE) diff --git a/android/jni/libusb.mk b/android/jni/libusb.mk index f4896b2..3308e79 100644 --- a/android/jni/libusb.mk +++ b/android/jni/libusb.mk @@ -16,16 +16,16 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # -LOCAL_PATH:= $(call my-dir) -LIBUSB_ROOT_REL:= ../.. -LIBUSB_ROOT_ABS:= $(LOCAL_PATH)/../.. +LOCAL_PATH := $(call my-dir) +LIBUSB_ROOT_REL := ../.. +LIBUSB_ROOT_ABS := $(LOCAL_PATH)/../.. # libusb include $(CLEAR_VARS) -LIBUSB_ROOT_REL:= ../.. -LIBUSB_ROOT_ABS:= $(LOCAL_PATH)/../.. +LIBUSB_ROOT_REL := ../.. +LIBUSB_ROOT_ABS := $(LOCAL_PATH)/../.. LOCAL_SRC_FILES := \ $(LIBUSB_ROOT_REL)/libusb/core.c \ @@ -47,6 +47,8 @@ LOCAL_C_INCLUDES += \ LOCAL_EXPORT_C_INCLUDES := \ $(LIBUSB_ROOT_ABS)/libusb +LOCAL_CFLAGS := -fvisibility=hidden -pthread + LOCAL_LDLIBS := -llog LOCAL_MODULE := libusb1.0 diff --git a/android/jni/tests.mk b/android/jni/tests.mk index 93d5516..6136f58 100644 --- a/android/jni/tests.mk +++ b/android/jni/tests.mk @@ -16,41 +16,23 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # -LOCAL_PATH:= $(call my-dir) -LIBUSB_ROOT_REL:= ../.. -LIBUSB_ROOT_ABS:= $(LOCAL_PATH)/../.. - -# testlib - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(LIBUSB_ROOT_REL)/tests/testlib.c - -LOCAL_C_INCLUDES += \ - $(LIBUSB_ROOT_ABS)/tests - -LOCAL_EXPORT_C_INCLUDES := \ - $(LIBUSB_ROOT_ABS)/tests - -LOCAL_MODULE := testlib - -include $(BUILD_STATIC_LIBRARY) - +LOCAL_PATH := $(call my-dir) +LIBUSB_ROOT_REL := ../.. +LIBUSB_ROOT_ABS := $(LOCAL_PATH)/../.. # stress include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - $(LIBUSB_ROOT_REL)/tests/stress.c + $(LIBUSB_ROOT_REL)/tests/stress.c \ + $(LIBUSB_ROOT_REL)/tests/testlib.c LOCAL_C_INCLUDES += \ $(LIBUSB_ROOT_ABS) LOCAL_SHARED_LIBRARIES += libusb1.0 -LOCAL_STATIC_LIBRARIES += testlib -LOCAL_MODULE:= stress +LOCAL_MODULE := stress include $(BUILD_EXECUTABLE) diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 1958a1e..518c4fe 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11480 +#define LIBUSB_NANO 11481 -- cgit v1.2.1