From f6e75b0db28bf3ba0e402069b0fc173411d414af Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 26 Apr 2018 02:15:59 +0200 Subject: gnu: adb: Use android-ndk-build-system. * 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. --- gnu/packages/patches/adb-add-libraries.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 gnu/packages/patches/adb-add-libraries.patch (limited to 'gnu/packages/patches/adb-add-libraries.patch') diff --git a/gnu/packages/patches/adb-add-libraries.patch b/gnu/packages/patches/adb-add-libraries.patch new file mode 100644 index 0000000000..06b3ec3764 --- /dev/null +++ b/gnu/packages/patches/adb-add-libraries.patch @@ -0,0 +1,19 @@ +--- 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 \ -- cgit v1.2.3 From 1a0dd01bf913d505c46e865b96057b5c1178640c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 10 May 2018 00:13:46 +0200 Subject: gnu: adb: Add missing "#include"s. * gnu/packages/patches/adb-add-libraries.patch: Add missing "#include"s. --- gnu/packages/patches/adb-add-libraries.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/patches/adb-add-libraries.patch') diff --git a/gnu/packages/patches/adb-add-libraries.patch b/gnu/packages/patches/adb-add-libraries.patch index 06b3ec3764..b014832f62 100644 --- a/gnu/packages/patches/adb-add-libraries.patch +++ b/gnu/packages/patches/adb-add-libraries.patch @@ -17,3 +17,14 @@ libbase \ libcrypto_static \ libdiagnose_usb \ +--- a/adb/sysdeps_test.cpp 2018-05-09 23:58:46.583163684 +0200 ++++ b/adb/sysdeps_test.cpp 2018-05-09 23:56:41.356544648 +0200 +@@ -17,6 +17,8 @@ + #include + #include + #include ++#include ++#include + + #include "adb_io.h" + #include "sysdeps.h" -- cgit v1.2.3