diff options
Diffstat (limited to 'android')
-rw-r--r-- | android/README | 144 | ||||
-rw-r--r-- | android/examples/unrooted_android.c | 300 | ||||
-rw-r--r-- | android/examples/unrooted_android.h | 36 | ||||
-rw-r--r-- | android/jni/examples.mk | 42 | ||||
-rw-r--r-- | android/jni/libusb.mk | 10 | ||||
-rw-r--r-- | android/jni/tests.mk | 8 |
6 files changed, 477 insertions, 63 deletions
diff --git a/android/README b/android/README index 32024ef..4af4c3d 100644 --- a/android/README +++ b/android/README @@ -48,69 +48,105 @@ application package (APK) file, provided ndk-build is invoked before the package is built. -For a rooted device it is possible to install libusb into the system -image of a running device: +Runtime Permissions: +-------------------- - 1. Enable ADB on the device. +The Runtime Permissions on Android can be transferred from Java to Native +over the following approach: - 2. Connect the device to a machine running ADB. + JAVA: - 3. Execute the following commands on the machine - running ADB: + --> Obtain USB permissions over the android.hardware.usb.UsbManager class - # Make the system partition writable - adb shell su -c "mount -o remount,rw /system" + usbManager = (UsbManager) getSystemService(Context.USB_SERVICE); + HashMap<String, UsbDevice> deviceList = usbManager.getDeviceList(); + for (UsbDevice usbDevice : deviceList.values()) { + usbManager.requestPermission(usbDevice, mPermissionIntent); + } - # Install libusb - adb push obj/local/armeabi/libusb1.0.so /sdcard/ - adb shell su -c "cat > /system/lib/libusb1.0.so < /sdcard/libusb1.0.so" - adb shell rm /sdcard/libusb1.0.so + --> Get the native FileDescriptor of the UsbDevice and transfer it to + Native over JNI or JNA - # Install the samples and tests - for B in listdevs fxload xusb sam3u_benchmark hotplugtest stress - do - adb push "obj/local/armeabi/$B" /sdcard/ - adb shell su -c "cat > /system/bin/$B < /sdcard/$B" - adb shell su -c "chmod 0755 /system/bin/$B" - adb shell rm "/sdcard/$B" - done + UsbDeviceConnection usbDeviceConnection = usbManager.openDevice(camDevice); + int fileDescriptor = usbDeviceConnection.getFileDescriptor(); - # Make the system partition read only again - adb shell su -c "mount -o remount,ro /system" + --> JNA sample method: - # Run listdevs to - adb shell su -c "listdevs" + JNA.INSTANCE.set_the_native_Descriptor(fileDescriptor); - 4. If your device only has a single OTG port then ADB can generally - be switched to using Wifi with the following commands when connected - via USB: + NATIVE: - adb shell netcfg - # Note the wifi IP address of the phone - adb tcpip 5555 - # Use the IP address from netcfg - adb connect 192.168.1.123:5555 + --> Initialize libusb on Android -Runtime Permissions: --------------------- + set_the_native_Descriptor(int fileDescriptor) { + libusb_context *ctx; + libusb_device_handle *devh; + libusb_set_option(&ctx, LIBUSB_OPTION_NO_DEVICE_DISCOVERY, NULL); + libusb_init(&ctx); + libusb_wrap_sys_device(NULL, (intptr_t)fileDescriptor, &devh); + } + /* From this point you can regularly use all libusb functions as usual */ + + About LIBUSB_OPTION_NO_DEVICE_DISCOVERY: + + The method libusb_set_option(&ctx, LIBUSB_OPTION_NO_DEVICE_DISCOVERY, NULL) + does not affect the ctx. + It allows initializing libusb on unrooted Android devices by skipping + the device enumeration. + +Rooted Devices: +--------------- + + For rooted devices the code using libusb could be executed as root + using the "su" command. An alternative would be to use the "su" command + to change the permissions on the appropriate /dev/bus/usb/ files. + + Users have reported success in using android.hardware.usb.UsbManager + to request permission to use the UsbDevice and then opening the + device. The difficulties in this method is that there is no guarantee + that it will continue to work in the future Android versions, it + requires invoking Java APIs and running code to match each + android.hardware.usb.UsbDevice to a libusb_device. + + For a rooted device it is possible to install libusb into the system + image of a running device: + + 1. Enable ADB on the device. + + 2. Connect the device to a machine running ADB. + + 3. Execute the following commands on the machine + running ADB: + + # Make the system partition writable + adb shell su -c "mount -o remount,rw /system" + + # Install libusb + adb push obj/local/armeabi/libusb1.0.so /sdcard/ + adb shell su -c "cat > /system/lib/libusb1.0.so < /sdcard/libusb1.0.so" + adb shell rm /sdcard/libusb1.0.so + + # Install the samples and tests + for B in listdevs fxload xusb sam3u_benchmark hotplugtest stress + do + adb push "obj/local/armeabi/$B" /sdcard/ + adb shell su -c "cat > /system/bin/$B < /sdcard/$B" + adb shell su -c "chmod 0755 /system/bin/$B" + adb shell rm "/sdcard/$B" + done + + # Make the system partition read only again + adb shell su -c "mount -o remount,ro /system" + + # Run listdevs to + adb shell su -c "listdevs" + + 4. If your device only has a single OTG port then ADB can generally + be switched to using Wifi with the following commands when connected + via USB: -The default system configuration on most Android device will not allow -access to USB devices. There are several options for changing this. - -If you have control of the system image then you can modify the -ueventd.rc used in the image to change the permissions on -/dev/bus/usb/*/*. If using this approach then it is advisable to -create a new Android permission to protect access to these files. -It is not advisable to give all applications read and write permissions -to these files. - -For rooted devices the code using libusb could be executed as root -using the "su" command. An alternative would be to use the "su" command -to change the permissions on the appropriate /dev/bus/usb/ files. - -Users have reported success in using android.hardware.usb.UsbManager -to request permission to use the UsbDevice and then opening the -device. The difficulties in this method is that there is no guarantee -that it will continue to work in the future Android versions, it -requires invoking Java APIs and running code to match each -android.hardware.usb.UsbDevice to a libusb_device. + adb shell netcfg + # Note the wifi IP address of the phone + adb tcpip 5555 + # Use the IP address from netcfg + adb connect 192.168.1.123:5555 diff --git a/android/examples/unrooted_android.c b/android/examples/unrooted_android.c new file mode 100644 index 0000000..33793c7 --- /dev/null +++ b/android/examples/unrooted_android.c @@ -0,0 +1,300 @@ +/* + * libusb example program for reading out USB descriptors on unrooted Android + * (based on testlibusb.c) + * + * Copyright 2020-2021 Peter Stoiber + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Please contact the author if you need another license. + * This Repository is provided "as is", without warranties of any kind. +*/ + +/* + * This example creates a shared object which can be accessed over JNA or JNI from Java or Kotlin in Android. + * Hint: If you are using Android Studio, set the "Debug type" to "Java Only" to receive debug messages. + */ + +/* + * Usage: + * First, you have to connect your USB device from the Java side. + * Use the android.hardware.usb class to find the USB device, claim the interfaces, and open the usb_device_connection + * Obtain the native File Descriptor --> usb_device_connection.getFileDescriptor() + * Pass the received int value to the unrooted_usb_description method of this code (over JNA) + */ + +/* + * libusb can only be included in Android projects using NDK for now. (CMake is not supported at the moment) + * Clone the libusb git repo into your Android project and include the Android.mk file in your build.gradle. + */ + +/* + Example JNA Approach: + public interface unrooted_sample extends Library { + public static final unrooted_sample INSTANCE = Native.load("unrooted_android", unrooted_sample.class); + public int unrooted_usb_description (int fileDescriptor); + } + unrooted_sample.INSTANCE.unrooted_usb_description( usbDeviceConnection.getFileDescriptor()); + */ + +#include <jni.h> +#include <string.h> +#include "unrooted_android.h" +#include "libusb.h" +#include <android/log.h> +#define LOG_TAG "LibUsb" +#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__) + +int verbose = 0; + +static void print_endpoint_comp(const struct libusb_ss_endpoint_companion_descriptor *ep_comp) +{ + LOGD(" USB 3.0 Endpoint Companion:\n"); + LOGD(" bMaxBurst: %u\n", ep_comp->bMaxBurst); + LOGD(" bmAttributes: %02xh\n", ep_comp->bmAttributes); + LOGD(" wBytesPerInterval: %u\n", ep_comp->wBytesPerInterval); +} + +static void print_endpoint(const struct libusb_endpoint_descriptor *endpoint) +{ + int i, ret; + + LOGD(" Endpoint:\n"); + LOGD(" bEndpointAddress: %02xh\n", endpoint->bEndpointAddress); + LOGD(" bmAttributes: %02xh\n", endpoint->bmAttributes); + LOGD(" wMaxPacketSize: %u\n", endpoint->wMaxPacketSize); + LOGD(" bInterval: %u\n", endpoint->bInterval); + LOGD(" bRefresh: %u\n", endpoint->bRefresh); + LOGD(" bSynchAddress: %u\n", endpoint->bSynchAddress); + + for (i = 0; i < endpoint->extra_length;) { + if (LIBUSB_DT_SS_ENDPOINT_COMPANION == endpoint->extra[i + 1]) { + struct libusb_ss_endpoint_companion_descriptor *ep_comp; + + ret = libusb_get_ss_endpoint_companion_descriptor(NULL, endpoint, &ep_comp); + if (LIBUSB_SUCCESS != ret) + continue; + + print_endpoint_comp(ep_comp); + + libusb_free_ss_endpoint_companion_descriptor(ep_comp); + } + + i += endpoint->extra[i]; + } +} + +static void print_altsetting(const struct libusb_interface_descriptor *interface) +{ + uint8_t i; + + LOGD(" Interface:\n"); + LOGD(" bInterfaceNumber: %u\n", interface->bInterfaceNumber); + LOGD(" bAlternateSetting: %u\n", interface->bAlternateSetting); + LOGD(" bNumEndpoints: %u\n", interface->bNumEndpoints); + LOGD(" bInterfaceClass: %u\n", interface->bInterfaceClass); + LOGD(" bInterfaceSubClass: %u\n", interface->bInterfaceSubClass); + LOGD(" bInterfaceProtocol: %u\n", interface->bInterfaceProtocol); + LOGD(" iInterface: %u\n", interface->iInterface); + + for (i = 0; i < interface->bNumEndpoints; i++) + print_endpoint(&interface->endpoint[i]); +} + +static void print_2_0_ext_cap(struct libusb_usb_2_0_extension_descriptor *usb_2_0_ext_cap) +{ + LOGD(" USB 2.0 Extension Capabilities:\n"); + LOGD(" bDevCapabilityType: %u\n", usb_2_0_ext_cap->bDevCapabilityType); + LOGD(" bmAttributes: %08xh\n", usb_2_0_ext_cap->bmAttributes); +} + +static void print_ss_usb_cap(struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap) +{ + LOGD(" USB 3.0 Capabilities:\n"); + LOGD(" bDevCapabilityType: %u\n", ss_usb_cap->bDevCapabilityType); + LOGD(" bmAttributes: %02xh\n", ss_usb_cap->bmAttributes); + LOGD(" wSpeedSupported: %u\n", ss_usb_cap->wSpeedSupported); + LOGD(" bFunctionalitySupport: %u\n", ss_usb_cap->bFunctionalitySupport); + LOGD(" bU1devExitLat: %u\n", ss_usb_cap->bU1DevExitLat); + LOGD(" bU2devExitLat: %u\n", ss_usb_cap->bU2DevExitLat); +} + +static void print_bos(libusb_device_handle *handle) +{ + struct libusb_bos_descriptor *bos; + uint8_t i; + int ret; + + ret = libusb_get_bos_descriptor(handle, &bos); + if (ret < 0) + return; + + LOGD(" Binary Object Store (BOS):\n"); + LOGD(" wTotalLength: %u\n", bos->wTotalLength); + LOGD(" bNumDeviceCaps: %u\n", bos->bNumDeviceCaps); + + for (i = 0; i < bos->bNumDeviceCaps; i++) { + struct libusb_bos_dev_capability_descriptor *dev_cap = bos->dev_capability[i]; + + if (dev_cap->bDevCapabilityType == LIBUSB_BT_USB_2_0_EXTENSION) { + struct libusb_usb_2_0_extension_descriptor *usb_2_0_extension; + + ret = libusb_get_usb_2_0_extension_descriptor(NULL, dev_cap, &usb_2_0_extension); + if (ret < 0) + return; + + print_2_0_ext_cap(usb_2_0_extension); + libusb_free_usb_2_0_extension_descriptor(usb_2_0_extension); + } else if (dev_cap->bDevCapabilityType == LIBUSB_BT_SS_USB_DEVICE_CAPABILITY) { + struct libusb_ss_usb_device_capability_descriptor *ss_dev_cap; + + ret = libusb_get_ss_usb_device_capability_descriptor(NULL, dev_cap, &ss_dev_cap); + if (ret < 0) + return; + + print_ss_usb_cap(ss_dev_cap); + libusb_free_ss_usb_device_capability_descriptor(ss_dev_cap); + } + } + + libusb_free_bos_descriptor(bos); +} + +static void print_interface(const struct libusb_interface *interface) +{ + int i; + + for (i = 0; i < interface->num_altsetting; i++) + print_altsetting(&interface->altsetting[i]); +} + +static void print_configuration(struct libusb_config_descriptor *config) +{ + uint8_t i; + + LOGD(" Configuration:\n"); + LOGD(" wTotalLength: %u\n", config->wTotalLength); + LOGD(" bNumInterfaces: %u\n", config->bNumInterfaces); + LOGD(" bConfigurationValue: %u\n", config->bConfigurationValue); + LOGD(" iConfiguration: %u\n", config->iConfiguration); + LOGD(" bmAttributes: %02xh\n", config->bmAttributes); + LOGD(" MaxPower: %u\n", config->MaxPower); + + for (i = 0; i < config->bNumInterfaces; i++) + print_interface(&config->interface[i]); +} + +static void print_device(libusb_device *dev, libusb_device_handle *handle) +{ + struct libusb_device_descriptor desc; + unsigned char string[256]; + const char *speed; + int ret; + uint8_t i; + + switch (libusb_get_device_speed(dev)) { + case LIBUSB_SPEED_LOW: speed = "1.5M"; break; + case LIBUSB_SPEED_FULL: speed = "12M"; break; + case LIBUSB_SPEED_HIGH: speed = "480M"; break; + case LIBUSB_SPEED_SUPER: speed = "5G"; break; + case LIBUSB_SPEED_SUPER_PLUS: speed = "10G"; break; + default: speed = "Unknown"; + } + + ret = libusb_get_device_descriptor(dev, &desc); + if (ret < 0) { + LOGD("failed to get device descriptor"); + return; + } + + LOGD("Dev (bus %u, device %u): %04X - %04X speed: %s\n", + libusb_get_bus_number(dev), libusb_get_device_address(dev), + desc.idVendor, desc.idProduct, speed); + + if (!handle) + libusb_open(dev, &handle); + + if (handle) { + if (desc.iManufacturer) { + ret = libusb_get_string_descriptor_ascii(handle, desc.iManufacturer, string, sizeof(string)); + if (ret > 0) + LOGD(" Manufacturer: %s\n", (char *)string); + } + + if (desc.iProduct) { + ret = libusb_get_string_descriptor_ascii(handle, desc.iProduct, string, sizeof(string)); + if (ret > 0) + LOGD(" Product: %s\n", (char *)string); + } + + if (desc.iSerialNumber && verbose) { + ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, string, sizeof(string)); + if (ret > 0) + LOGD(" Serial Number: %s\n", (char *)string); + } + } + + if (verbose) { + for (i = 0; i < desc.bNumConfigurations; i++) { + struct libusb_config_descriptor *config; + + ret = libusb_get_config_descriptor(dev, i, &config); + if (LIBUSB_SUCCESS != ret) { + LOGD(" Couldn't retrieve descriptors\n"); + continue; + } + + print_configuration(config); + + libusb_free_config_descriptor(config); + } + + if (handle && desc.bcdUSB >= 0x0201) + print_bos(handle); + } + + if (handle) + libusb_close(handle); +} + + +/* fileDescriptor = the native file descriptor obtained in Java and transferred to native over JNA, for example */ +int unrooted_usb_description(int fileDescriptor) +{ + libusb_context *ctx = NULL; + libusb_device_handle *devh = NULL; + int r = 0; + verbose = 1; + r = libusb_set_option(NULL, LIBUSB_OPTION_NO_DEVICE_DISCOVERY, NULL); + if (r != LIBUSB_SUCCESS) { + LOGD("libusb_set_option failed: %d\n", r); + return -1; + } + r = libusb_init(&ctx); + if (r < 0) { + LOGD("libusb_init failed: %d\n", r); + return r; + } + r = libusb_wrap_sys_device(ctx, (intptr_t)fileDescriptor, &devh); + if (r < 0) { + LOGD("libusb_wrap_sys_device failed: %d\n", r); + return r; + } else if (devh == NULL) { + LOGD("libusb_wrap_sys_device returned invalid handle\n"); + return r; + } + print_device(libusb_get_device(devh), devh); + return r; +} diff --git a/android/examples/unrooted_android.h b/android/examples/unrooted_android.h new file mode 100644 index 0000000..7ccd408 --- /dev/null +++ b/android/examples/unrooted_android.h @@ -0,0 +1,36 @@ +/* + * Copyright 2021 Peter Stoiber + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Please contact the author if you need another license. + * This Repository is provided "as is", without warranties of any kind. +*/ + +#ifndef unrooted_android_H +#define unrooted_android_H + +#ifdef __cplusplus +extern "C" { +#endif + +extern int unrooted_usb_description(int fileDescriptor); + +#ifdef __cplusplus +} +#endif + +#endif + diff --git a/android/jni/examples.mk b/android/jni/examples.mk index d0ffb82..237141a 100644 --- a/android/jni/examples.mk +++ b/android/jni/examples.mk @@ -20,6 +20,12 @@ LOCAL_PATH := $(call my-dir) LIBUSB_ROOT_REL := ../.. LIBUSB_ROOT_ABS := $(LOCAL_PATH)/../.. +ifeq ($(USE_PC_NAME),1) + LIBUSB_MODULE := usb-1.0 +else + LIBUSB_MODULE := libusb1.0 +endif + # dpfp include $(CLEAR_VARS) @@ -31,7 +37,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/.. \ $(LIBUSB_ROOT_ABS) -LOCAL_SHARED_LIBRARIES += libusb1.0 +LOCAL_SHARED_LIBRARIES += $(LIBUSB_MODULE) LOCAL_MODULE := dpfp LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 @@ -53,7 +59,7 @@ LOCAL_C_INCLUDES += \ LOCAL_CFLAGS := -DDPFP_THREADED -pthread -LOCAL_SHARED_LIBRARIES += libusb1.0 +LOCAL_SHARED_LIBRARIES += $(LIBUSB_MODULE) LOCAL_MODULE := dpfp_threaded LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 @@ -74,7 +80,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/.. \ $(LIBUSB_ROOT_ABS) -LOCAL_SHARED_LIBRARIES += libusb1.0 +LOCAL_SHARED_LIBRARIES += $(LIBUSB_MODULE) LOCAL_MODULE := fxload LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 @@ -94,7 +100,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/.. \ $(LIBUSB_ROOT_ABS) -LOCAL_SHARED_LIBRARIES += libusb1.0 +LOCAL_SHARED_LIBRARIES += $(LIBUSB_MODULE) LOCAL_MODULE := hotplugtest LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 @@ -114,7 +120,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/.. \ $(LIBUSB_ROOT_ABS) -LOCAL_SHARED_LIBRARIES += libusb1.0 +LOCAL_SHARED_LIBRARIES += $(LIBUSB_MODULE) LOCAL_MODULE := listdevs LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 @@ -134,7 +140,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/.. \ $(LIBUSB_ROOT_ABS) -LOCAL_SHARED_LIBRARIES += libusb1.0 +LOCAL_SHARED_LIBRARIES += $(LIBUSB_MODULE) LOCAL_MODULE := sam3u_benchmark LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 @@ -154,7 +160,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/.. \ $(LIBUSB_ROOT_ABS) -LOCAL_SHARED_LIBRARIES += libusb1.0 +LOCAL_SHARED_LIBRARIES += $(LIBUSB_MODULE) LOCAL_MODULE := xusb LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 @@ -162,3 +168,25 @@ LOCAL_LICENSE_CONDITIONS := restricted LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE include $(BUILD_EXECUTABLE) + +# unrooted_android + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(LIBUSB_ROOT_REL)/android/examples/unrooted_android.c + +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/.. \ + $(LIBUSB_ROOT_ABS) + +LOCAL_SHARED_LIBRARIES += libusb1.0 + +LOCAL_LDLIBS += -llog + +LOCAL_MODULE := unrooted_android + +LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 +LOCAL_LICENSE_CONDITIONS := restricted +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE +include $(BUILD_SHARED_LIBRARY) diff --git a/android/jni/libusb.mk b/android/jni/libusb.mk index c7ac77c..d40c88a 100644 --- a/android/jni/libusb.mk +++ b/android/jni/libusb.mk @@ -48,7 +48,15 @@ LOCAL_CFLAGS := -fvisibility=hidden -pthread LOCAL_LDLIBS := -llog -LOCAL_MODULE := libusb1.0 +ifeq ($(USE_PC_NAME),1) + LOCAL_MODULE := usb-1.0 +else + LOCAL_MODULE := libusb1.0 + $(warning Building to legacy library name libusb1.0, which differs from pkg-config.) + $(warning Use ndk-build USE_PC_NAME=1 to change the module name to the compatible usb-1.0.) + $(warning USE_PC_NAME=1 may be the default in the future.) +endif + LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 LOCAL_LICENSE_CONDITIONS := restricted LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE diff --git a/android/jni/tests.mk b/android/jni/tests.mk index 56315c5..8d7a04b 100644 --- a/android/jni/tests.mk +++ b/android/jni/tests.mk @@ -20,6 +20,12 @@ LOCAL_PATH := $(call my-dir) LIBUSB_ROOT_REL := ../.. LIBUSB_ROOT_ABS := $(LOCAL_PATH)/../.. +ifeq ($(USE_PC_NAME),1) + LIBUSB_MODULE := usb-1.0 +else + LIBUSB_MODULE := libusb1.0 +endif + # stress include $(CLEAR_VARS) @@ -32,7 +38,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/.. \ $(LIBUSB_ROOT_ABS) -LOCAL_SHARED_LIBRARIES += libusb1.0 +LOCAL_SHARED_LIBRARIES += $(LIBUSB_MODULE) LOCAL_MODULE := stress LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 |