mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
f6e75b0db2
* gnu/packages/android.scm (adb)[build-system]: Switch to android-ndk-build-system. [arguments]<#:tests?>: Disable. [arguments]<#:phases>[create-Makefile]: Delete phase. [arguments]<#:phases>[fix-clang]: Delete phase. [arguments]<#:phases>[fix-main]: Delete phase. [arguments]<#:phases>[make-libs-available]: New phase. [arguments]<#:phases>[install-headers]: New phase. [arguments]<#:make-flags]: Add CFLAGS, CXXFLAGS. [inputs]: Add liblog. [source]: Add patch "adb-add-libraries.patch". * gnu/packages/patches/adb-add-libraries.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
19 lines
642 B
Diff
19 lines
642 B
Diff
--- a/adb/Android.mk 2018-04-25 23:23:29.527198350 +0200
|
|
+++ b/adb/Android.mk 2018-04-25 23:24:25.558632573 +0200
|
|
@@ -226,7 +226,7 @@
|
|
LOCAL_SRC_FILES := test_track_devices.cpp
|
|
LOCAL_SANITIZE := $(adb_host_sanitize)
|
|
LOCAL_SHARED_LIBRARIES := libbase
|
|
-LOCAL_STATIC_LIBRARIES := libadb libcrypto_static libcutils
|
|
+LOCAL_STATIC_LIBRARIES := libadb libbase libcrypto_static libcutils
|
|
LOCAL_LDLIBS += -lrt -ldl -lpthread
|
|
include $(BUILD_HOST_EXECUTABLE)
|
|
endif
|
|
@@ -278,6 +278,7 @@
|
|
LOCAL_SANITIZE := $(adb_host_sanitize)
|
|
LOCAL_STATIC_LIBRARIES := \
|
|
libadb \
|
|
+ libcutils \
|
|
libbase \
|
|
libcrypto_static \
|
|
libdiagnose_usb \
|