aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2021-03-23 22:16:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-03-23 22:16:20 +0000
commitfc5d6fcbb37512665b2a91ad8837c11328e41a13 (patch)
treefa75ceb3b14583c5d65a1833ba331d7505a005c4
parentb81de9ff3fc4c27d3f7946e988604068dfbd9731 (diff)
parentd91590125c0df477a122fcaa54746a7da0e43f7f (diff)
downloadqemu-snap-temp-L90800000842546896.tar.gz
Merge "Use weak_framework for IOUSBHost on macOS" into snap-temp-L90800000842546896snap-temp-L90800000842546896
-rw-r--r--android/third_party/libusb/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/third_party/libusb/CMakeLists.txt b/android/third_party/libusb/CMakeLists.txt
index 8b539512ab..af1c54d15e 100644
--- a/android/third_party/libusb/CMakeLists.txt
+++ b/android/third_party/libusb/CMakeLists.txt
@@ -41,12 +41,12 @@ android_target_link_libraries(
emulator-libusb darwin-x86_64 PRIVATE "-framework IOKit"
"-framework Foundation"
"-framework CoreFoundation"
- "-framework IOUSBHost")
+ "-weak_framework IOUSBHost")
android_target_link_libraries(
emulator-libusb darwin-aarch64 PRIVATE "-framework IOKit"
"-framework Foundation"
"-framework CoreFoundation"
- "-framework IOUSBHost")
+ "-weak_framework IOUSBHost")
# These are very slow.. 27.97s user 90.95s system 75% cpu 2:37.73 total
android_add_executable(TARGET libusb_stress_tests NODISTRIBUTE