[arch-commits] Commit in android-tools/trunk (3 files)

Anatol Pomozov anatolik at archlinux.org
Wed Dec 6 00:06:19 UTC 2017


    Date: Wednesday, December 6, 2017 @ 00:06:17
  Author: anatolik
Revision: 272348

upgpkg: android-tools 8.1.0_r1-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/fix_build_core.patch
  android-tools/trunk/generate_build.rb

----------------------+
 PKGBUILD             |    8 ++++----
 fix_build_core.patch |   32 ++++++++++++++++++++++++++++----
 generate_build.rb    |   13 +++++++------
 3 files changed, 39 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-05 23:28:42 UTC (rev 272347)
+++ PKGBUILD	2017-12-06 00:06:17 UTC (rev 272348)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd <alucryd at gmail dot com>
 
 pkgname=android-tools
-pkgver=8.0.0_r17
+pkgver=8.1.0_r1
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -13,7 +13,7 @@
 depends=(pcre2 libusb)
 optdepends=('python: for mkbootimg script')
 makedepends=(git clang gtest ruby cmake ninja go-pie)
-_boringssl_commit=bbfe603519bc54fbc4c8dd87efe1ed385df550b4 # keep it in sync with android https://android.googlesource.com/platform/external/boringssl/+/$pkgver/BORINGSSL_REVISION
+_boringssl_commit=14308731e5446a73ac2258688a9688b524483cb6 # keep it in sync with android https://android.googlesource.com/platform/external/boringssl/+/$pkgver/BORINGSSL_REVISION
 source=(git+https://android.googlesource.com/platform/system/core#tag=android-$pkgver
         git+https://android.googlesource.com/platform/system/extras#tag=android-$pkgver
         git+https://android.googlesource.com/platform/external/selinux#tag=android-$pkgver
@@ -29,8 +29,8 @@
           'SKIP'
           'SKIP'
           'SKIP'
-          '12b6bc1cbf850958850c3e4a5bc19d8b32f845b9'
-          '45e41bab3633bb0be96b238aae3164a5c90721f1'
+          'fa0e4579f2f26a0e0efe53549e9a91ef3a334eff'
+          '640db48e8e915f8c7f525dd044f16a3b502d4689'
           'ec473160d7445f97bccabd1c32ac0ae2f77900c1'
           '7004dbd0c193668827174880de6f8434de8ceaee')
 

Modified: fix_build_core.patch
===================================================================
--- fix_build_core.patch	2017-12-05 23:28:42 UTC (rev 272347)
+++ fix_build_core.patch	2017-12-06 00:06:17 UTC (rev 272348)
@@ -1,5 +1,5 @@
 diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp
-index 7adb26213..7596c123b 100644
+index 81201995a0..cfd60fce97 100644
 --- a/adb/client/usb_libusb.cpp
 +++ b/adb/client/usb_libusb.cpp
 @@ -21,6 +21,7 @@
@@ -19,8 +19,20 @@
  
  #include <android-base/file.h>
  #include <android-base/logging.h>
+diff --git a/adb/sysdeps/posix/network.cpp b/adb/sysdeps/posix/network.cpp
+index 45da5af4a1..ee3bf06994 100644
+--- a/adb/sysdeps/posix/network.cpp
++++ b/adb/sysdeps/posix/network.cpp
+@@ -21,6 +21,7 @@
+ #include <sys/socket.h>
+ 
+ #include <string>
++#include <string.h>
+ 
+ #include "adb_unique_fd.h"
+ 
 diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp
-index 296995efe..48269b675 100644
+index 296995efe2..48269b6750 100644
 --- a/base/errors_unix.cpp
 +++ b/base/errors_unix.cpp
 @@ -17,6 +17,7 @@
@@ -32,7 +44,7 @@
  namespace android {
  namespace base {
 diff --git a/base/file.cpp b/base/file.cpp
-index d4e58942c..ca7655fa2 100644
+index a2f28878e8..0aa185e972 100644
 --- a/base/file.cpp
 +++ b/base/file.cpp
 @@ -22,6 +22,7 @@
@@ -44,7 +56,7 @@
  #include <memory>
  #include <mutex>
 diff --git a/base/logging.cpp b/base/logging.cpp
-index 6357b4ba7..3c7dbce13 100644
+index 6357b4ba73..3c7dbce131 100644
 --- a/base/logging.cpp
 +++ b/base/logging.cpp
 @@ -23,6 +23,7 @@
@@ -55,3 +67,15 @@
  
  // For getprogname(3) or program_invocation_short_name.
  #if defined(__ANDROID__) || defined(__APPLE__)
+diff --git a/libsparse/sparse_read.cpp b/libsparse/sparse_read.cpp
+index bd668735a3..6168f2e248 100644
+--- a/libsparse/sparse_read.cpp
++++ b/libsparse/sparse_read.cpp
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string>
++#include <string.h>
+ #include <unistd.h>
+ 
+ #include <sparse/sparse.h>

Modified: generate_build.rb
===================================================================
--- generate_build.rb	2017-12-05 23:28:42 UTC (rev 272347)
+++ generate_build.rb	2017-12-06 00:06:17 UTC (rev 272348)
@@ -85,7 +85,7 @@
   adb_auth_host.cpp
   shell_service_protocol.cpp
 )
-libadbd = compile(expand('core/adb', adbdfiles), '-DADB_REVISION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include')
+libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include')
 
 adbfiles = %w(
   console.cpp
@@ -100,6 +100,7 @@
   client/usb_dispatch.cpp
   client/usb_linux.cpp
   client/usb_libusb.cpp
+  sysdeps/posix/network.cpp
 )
 libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb')
 
@@ -110,6 +111,7 @@
   stringprintf.cpp
   strings.cpp
   errors_unix.cpp
+  test_utils.cpp
 )
 libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include')
 
@@ -133,7 +135,6 @@
   load_file.c
   socket_local_client_unix.c
   socket_network_client_unix.c
-  socket_loopback_server_unix.c
   socket_local_server_unix.c
   sockets_unix.cpp
   socket_inaddr_any_server_unix.c
@@ -172,7 +173,7 @@
   tcp.cpp
   udp.cpp
 )
-libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_REVISION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils')
+libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include')
 
 sparsefiles = %w(
   backed_block.c
@@ -180,9 +181,9 @@
   sparse.c
   sparse_crc32.c
   sparse_err.c
-  sparse_read.c
+  sparse_read.cpp
 )
-libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include')
+libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include')
 
 f2fsfiles = %w(
   f2fs_utils.c
@@ -194,7 +195,7 @@
 zipfiles = %w(
   zip_archive.cc
 )
-libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include')
+libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include -Icore/libziparchive/include')
 
 utilfiles = %w(
   FileMap.cpp



More information about the arch-commits mailing list