rpms/android-tools
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatic version update by autodist [release 29.0.5-1mamba;Sun Dec 01 2019]

Browse Source
This commit is contained in:
Automatic Build System 2024-01-05 20:24:02 +01:00
parent 791d201119
commit c64d9c0bf3
3 changed files with 157 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
android-tools-29.0.4-build-core.patch → android-tools-29.0.5-build-core.patch
View File

@ -1,5 +1,5 @@
diff --git a/adb/adb.cpp b/adb/adb.cpp
index 098ed38f30..d0b2e87e7c 100644
index 1ec145b25c..b6e943f6ee 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -44,8 +44,6 @@
@ -53,20 +53,21 @@ index 53f01a0ce5..b4c3aadc28 100644
#include <android-base/file.h>
#include <android-base/logging.h>
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 8923f409df..5cadb9649b 100644
index 2fe3b1a9e0..a61b221ce3 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -58,9 +58,7 @@
@@ -59,10 +59,8 @@
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
-#include <build/version.h>
#include <libavb/libavb.h>
#include <liblp/liblp.h>
-#include <platform_tools_version.h>
#include <sparse/sparse.h>
#include <ziparchive/zip_archive.h>
@@ -1749,7 +1747,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
@@ -1783,7 +1781,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
setvbuf(stdout, nullptr, _IONBF, 0);
setvbuf(stderr, nullptr, _IONBF, 0);
} else if (name == "version") {

220
android-tools-generate_build.rb → android-tools-29.0.5-generate_build.rb
View File

@ -10,7 +10,7 @@ end
# Compiles sources to *.o files.
# Returns array of output *.o filenames
def compile(sources, cflags)
def compile(sources, cflags, params = {})
outputs = []
for s in sources
ext = File.extname(s)
@ -28,12 +28,30 @@ def compile(sources, cflags)
output = s + ".o"
outputs << output
puts "build #{output}: #{cc} #{s}\n cflags = #{lang_flags} #{cflags}"
order_deps = if params[:order_deps]
" || " + params[:order_deps].join(" ")
else
""
end
puts "build #{output}: #{cc} #{s}#{order_deps}\n cflags = #{lang_flags} #{cflags}"
end
return outputs
end
# Generate proto and compile it
def protoc(source)
basename = File.join(File.dirname(source), File.basename(source, ".proto"))
cfile = basename + ".pb.cc"
hfile = basename + ".pb.h"
ofile = cfile + ".o"
puts "build #{cfile} #{hfile}: protoc #{source}"
puts "build #{ofile}: cc #{cfile}\n cflags = -std=gnu++2a $CXXFLAGS $CPPFLAGS -I."
return hfile, cfile, ofile
end
# dir - directory where ninja file is located
# lib - static library path relative to dir
def subninja(dir, lib)
@ -46,6 +64,10 @@ def link(output, objects, ldflags)
puts "build #{output}: link #{objects.join(" ")}\n ldflags = #{ldflags} $LDFLAGS"
end
def genheader(input, variable, output)
puts "build #{output}: genheader #{input}\n var = #{variable}"
end
puts "# This set of commands generated by generate_build.rb script\n\n"
puts "CC = #{ENV["CC"] || "clang"}"
puts "CXX = #{ENV["CXX"] || "clang++"}\n\n"
@ -64,6 +86,12 @@ rule cxx
rule link
command = $CXX $ldflags $LDFLAGS $in -o $out
rule protoc
command = protoc --cpp_out=. $in
rule genheader
command = (echo 'unsigned char $var[] = {' && xxd -i <$in && echo '};') > $out
" ""
@ -73,78 +101,97 @@ adbdfiles = %w(
adb_listeners.cpp
adb_trace.cpp
adb_utils.cpp
fdevent/fdevent.cpp
fdevent/fdevent_poll.cpp
fdevent/fdevent_epoll.cpp
shell_service_protocol.cpp
sockets.cpp
transport.cpp
transport_local.cpp
transport_usb.cpp
fdevent/fdevent.cpp
fdevent/fdevent_poll.cpp
shell_service_protocol.cpp
)
libadbd = compile(expand("core/adb", adbdfiles), '-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include -Icore/diagnose_usb/include')
apkent_h, apkent_c, apkent_o = protoc("core/adb/fastdeploy/proto/ApkEntry.proto")
deployagent_inc = "core/adb/client/deployagent.inc"
genheader("deployagent.jar", "kDeployAgent", deployagent_inc)
deployagentscript_inc = "core/adb/client/deployagentscript.inc"
genheader("core/adb/fastdeploy/deployagent/deployagent.sh", "kDeployAgentScript", deployagentscript_inc)
adbfiles = %w(
socket_spec.cpp
services.cpp
sysdeps_unix.cpp
sysdeps/errno.cpp
client/main.cpp
client/adb_client.cpp
client/adb_install.cpp
client/auth.cpp
client/commandline.cpp
client/usb_dispatch.cpp
client/usb_linux.cpp
client/usb_libusb.cpp
client/bugreport.cpp
client/commandline.cpp
client/console.cpp
client/fastdeploy.cpp
client/fastdeploycallbacks.cpp
client/file_sync_client.cpp
client/line_printer.cpp
client/adb_install.cpp
client/console.cpp
client/main.cpp
client/usb_dispatch.cpp
client/usb_libusb.cpp
client/usb_linux.cpp
fastdeploy/deploypatchgenerator/apk_archive.cpp
fastdeploy/deploypatchgenerator/deploy_patch_generator.cpp
fastdeploy/deploypatchgenerator/patch_utils.cpp
services.cpp
socket_spec.cpp
sysdeps/errno.cpp
sysdeps/posix/network.cpp
sysdeps_unix.cpp
)
libadb = compile(expand("core/adb", adbfiles), "-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include")
libadb = compile(expand("core/adb", adbfiles), "-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include -Ibase/libs/androidfw/include -Inative/include", :order_deps => [apkent_h, deployagent_inc, deployagentscript_inc])
androidfwfiles = %w(
LocaleData.cpp
ResourceTypes.cpp
TypeWrappers.cpp
ZipFileRO.cpp
)
libandroidfw = compile(expand("base/libs/androidfw", androidfwfiles), "-Icore/base/include -Ibase/libs/androidfw/include -Icore/libutils/include -Icore/liblog/include -Icore/libsystem/include -Inative/include -Icore/libcutils/include -Icore/libziparchive/include")
basefiles = %w(
chrono_utils.cpp
errors_unix.cpp
file.cpp
logging.cpp
threads.cpp
mapped_file.cpp
parsenetaddress.cpp
stringprintf.cpp
strings.cpp
errors_unix.cpp
test_utils.cpp
chrono_utils.cpp
threads.cpp
)
libbase = compile(expand("core/base", basefiles), "-DADB_HOST=1 -Icore/base/include -Icore/include")
logfiles = %w(
log_event_write.cpp
fake_log_device.cpp
log_event_list.cpp
logger_write.cpp
config_write.cpp
config_read.cpp
logger_lock.cpp
fake_writer.cpp
log_event_list.cpp
log_event_write.cpp
logger_lock.cpp
logger_name.cpp
stderr_write.cpp
logger_write.cpp
logprint.cpp
)
liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include")
cutilsfiles = %w(
load_file.cpp
socket_local_client_unix.cpp
socket_network_client_unix.cpp
socket_local_server_unix.cpp
sockets_unix.cpp
socket_inaddr_any_server_unix.cpp
sockets.cpp
android_get_control_file.cpp
threads.cpp
fs_config.cpp
canned_fs_config.cpp
fs_config.cpp
load_file.cpp
socket_inaddr_any_server_unix.cpp
socket_local_client_unix.cpp
socket_local_server_unix.cpp
socket_network_client_unix.cpp
sockets.cpp
sockets_unix.cpp
threads.cpp
)
libcutils = compile(expand("core/libcutils", cutilsfiles), "-D_GNU_SOURCE -Icore/libcutils/include -Icore/include -Icore/base/include")
@ -162,30 +209,28 @@ libcrypto = compile(expand("core/libcrypto_utils", libcryptofiles), "-Icore/libc
#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a'])
boringssl = ["boringssl/build/crypto/libcrypto.a"]
link("adb", libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, "-lpthread -lusb-1.0")
fastbootfiles = %w(
bootimg_utils.cpp
fastboot.cpp
util.cpp
fastboot_driver.cpp
fs.cpp
usb_linux.cpp
main.cpp
socket.cpp
tcp.cpp
udp.cpp
main.cpp
fastboot_driver.cpp
usb_linux.cpp
util.cpp
)
libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Imkbootimg/include/bootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/fs_mgr/liblp/include -Icore/diagnose_usb/include')
libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DPLATFORM_TOOLS_VERSION="\"$PLATFORM_TOOLS_VERSION\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Imkbootimg/include/bootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/fs_mgr/liblp/include -Icore/diagnose_usb/include -Iavb')
fsmgrfiles = %w(
liblp/reader.cpp
liblp/writer.cpp
liblp/utility.cpp
liblp/partition_opener.cpp
liblp/images.cpp
liblp/partition_opener.cpp
liblp/reader.cpp
liblp/utility.cpp
liblp/writer.cpp
)
libfsmgr = compile(expand("core/fs_mgr", fsmgrfiles), '-Icore/fs_mgr/liblp/include -Icore/base/include -Iextras/ext4_utils/include -Icore/libsparse/include')
libfsmgr = compile(expand("core/fs_mgr", fsmgrfiles), "-Icore/fs_mgr/liblp/include -Icore/base/include -Iextras/ext4_utils/include -Icore/libsparse/include")
sparsefiles = %w(
backed_block.cpp
@ -208,8 +253,13 @@ libzip = compile(expand("core/libziparchive", zipfiles), "-Icore/base/include -I
utilfiles = %w(
FileMap.cpp
SharedBuffer.cpp
String16.cpp
String8.cpp
VectorImpl.cpp
Unicode.cpp
)
libutil = compile(expand("core/libutils", utilfiles), "-Icore/include")
libutil = compile(expand("core/libutils", utilfiles), "-Icore/include -Icore/base/include")
ext4files = %w(
ext4_utils.cpp
@ -219,58 +269,58 @@ ext4files = %w(
libext4 = compile(expand("extras/ext4_utils", ext4files), "-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include -Icore/base/include")
selinuxfiles = %w(
booleans.c
callbacks.c
canonicalize_context.c
check_context.c
disable.c
enabled.c
freecon.c
getenforce.c
init.c
label_backends_android.c
label.c
label_file.c
label_support.c
setrans_client.c
regex.c
matchpathcon.c
selinux_config.c
label_backends_android.c
canonicalize_context.c
lsetfilecon.c
policyvers.c
lgetfilecon.c
load_policy.c
lsetfilecon.c
matchpathcon.c
policyvers.c
regex.c
selinux_config.c
setenforce.c
setrans_client.c
seusers.c
sha1.c
booleans.c
disable.c
enabled.c
getenforce.c
setenforce.c
)
libselinux = compile(expand("selinux/libselinux/src", selinuxfiles), "-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include")
libsepolfiles = %w(
policydb_public.c
genbools.c
debug.c
policydb.c
conditional.c
services.c
ebitmap.c
util.c
assertion.c
avtab.c
hashtab.c
sidtab.c
context.c
genusers.c
context_record.c
mls.c
avrule_block.c
symtab.c
policydb_convert.c
write.c
avtab.c
conditional.c
constraint.c
context.c
context_record.c
debug.c
ebitmap.c
expand.c
genbools.c
genusers.c
hashtab.c
hierarchy.c
kernel_to_common.c
mls.c
policydb.c
policydb_convert.c
policydb_public.c
services.c
sidtab.c
symtab.c
util.c
write.c
)
libsepol = compile(expand("selinux/libsepol/src", libsepolfiles), "-Iselinux/libsepol/include -Iselinux/libsepol/src")
@ -289,6 +339,7 @@ libext2fsfiles = %w(
lib/blkid/resolve.c
lib/blkid/save.c
lib/blkid/tag.c
lib/e2p/encoding.c
lib/e2p/feature.c
lib/e2p/hashstr.c
lib/e2p/mntopts.c
@ -347,6 +398,7 @@ libext2fsfiles = %w(
lib/ext2fs/mmp.c
lib/ext2fs/namei.c
lib/ext2fs/newdir.c
lib/ext2fs/nls_utf8.c
lib/ext2fs/openfs.c
lib/ext2fs/progress.c
lib/ext2fs/punch.c
@ -392,12 +444,12 @@ mke2fs = compile(expand("e2fsprogs", mke2fsfiles), "-Ie2fsprogs/lib")
link("mke2fs.android", mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, "-lpthread -lz")
e2fsdroidfiles = %w(
contrib/android/e2fsdroid.c
contrib/android/basefs_allocator.c
contrib/android/block_range.c
contrib/android/base_fs.c
contrib/android/fsmap.c
contrib/android/block_list.c
contrib/android/block_range.c
contrib/android/e2fsdroid.c
contrib/android/fsmap.c
contrib/android/perms.c
)
e2fsdroid = compile(expand("e2fsprogs", e2fsdroidfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc")
@ -410,3 +462,5 @@ ext2simgfiles = %w(
ext2simg = compile(expand("e2fsprogs", ext2simgfiles), "-Ie2fsprogs/lib -Icore/libsparse/include")
link("ext2simg", ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, "-lz -lpthread")
link("adb", libbase + liblog + libcutils + libutil + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl + libandroidfw + libzip + [apkent_o], "-lpthread -lusb-1.0 -lprotobuf-lite -lz")

18
android-tools.spec
View File

@ -1,6 +1,6 @@
%define _boringssl_commit %(curl https://android.googlesource.com/platform/external/boringssl/+/refs/tags/platform-tools-%{version}/BORINGSSL_REVISION?format=TEXT | base64 -d)
Name: android-tools
Version: 29.0.4
Version: 29.0.5
Release: 1mamba
Summary: Android platform tools
Group: System/Tools
@ -16,12 +16,15 @@ Source4: https://android.googlesource.com/platform/external/f2fs-tools.git
Source5: https://android.googlesource.com/platform/external/e2fsprogs.git/platform-tools-%{version}/e2fsprogs-%{version}.tar.bz2
Source6: https://android.googlesource.com/platform/external/avb.git/platform-tools-%{version}/avb-%{version}.tar.bz2
Source7: https://boringssl.googlesource.com/boringssl.git/master@%{_boringssl_commit}/boringssl-%{version}.tar.bz2
Source8: deployagent-29.0.5.jar
Source9: https://android.googlesource.com/platform/frameworks/base.git/platform-tools-%{version}/base-%{version}.tar.bz2
Source10: https://android.googlesource.com/platform/frameworks/native.git/platform-tools-%{version}/native-%{version}.tar.bz2
# From arch linux
Source20: android-tools-generate_build.rb
Source20: android-tools-29.0.5-generate_build.rb
Source21: android-tools-bash_completion.fastboot
Patch0: android-tools-5.0.2_r1-remove-selinux-header.patch
Patch1: android-tools-7.1.1_r13-fix-build.patch
Patch2: android-tools-29.0.4-build-core.patch
Patch2: android-tools-29.0.5-build-core.patch
License: Apache License 2.0, BSD
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -58,11 +61,13 @@ This package also includes mkbootfs.
%debug_package
%prep
%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7
%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a9 -a10
#% setup -q -c -D -T
#:<< _EOF
mv core-%{version} core
mv base-%{version} base
mv native-%{version} native
mv extras-%{version} extras
mv mkbootimg-%{version} mkbootimg
mv selinux-%{version} selinux
@ -88,6 +93,8 @@ sed -i "s|link(\"fastboot|#link\(\"fastboot|" generate_build.rb
chmod +x generate_build.rb
PLATFORM_TOOLS_VERSION="%{version}-%{release}" LDFLAGS='-Wl,-z,relro,-z,now' ./generate_build.rb > build.ninja
cp %{SOURCE8} deployagent.jar
%build
cd boringssl
%cmake -dbuild \
@ -134,6 +141,9 @@ install -Dm 644 %{SOURCE21} %{buildroot}%{_datadir}/bash-completion/completions/
%{_bindir}/mkbootimg
%changelog
* Sun Dec 01 2019 Automatic Build System <autodist@mambasoft.it> 29.0.5-1mamba
- automatic version update by autodist
* Sun Oct 27 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 29.0.4-1mamba
- update to 29.0.4