automatic version update by autodist [release 29.0.6-1mamba;Fri Mar 13 2020]

This commit is contained in:
Automatic Build System 2024-01-05 20:24:02 +01:00
parent c64d9c0bf3
commit ce40fa5e34
3 changed files with 15 additions and 13 deletions

View File

@ -29,10 +29,10 @@ def compile(sources, cflags, params = {})
output = s + ".o" output = s + ".o"
outputs << output outputs << output
order_deps = if params[:order_deps] order_deps = if params[:order_deps]
" || " + params[:order_deps].join(" ") " || " + params[:order_deps].join(" ")
else else
"" ""
end end
puts "build #{output}: #{cc} #{s}#{order_deps}\n cflags = #{lang_flags} #{cflags}" puts "build #{output}: #{cc} #{s}#{order_deps}\n cflags = #{lang_flags} #{cflags}"
end end
@ -109,6 +109,7 @@ adbdfiles = %w(
transport.cpp transport.cpp
transport_local.cpp transport_local.cpp
transport_usb.cpp transport_usb.cpp
types.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') 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')
@ -158,6 +159,7 @@ basefiles = %w(
chrono_utils.cpp chrono_utils.cpp
errors_unix.cpp errors_unix.cpp
file.cpp file.cpp
liblog_symbols.cpp
logging.cpp logging.cpp
mapped_file.cpp mapped_file.cpp
parsenetaddress.cpp parsenetaddress.cpp
@ -169,16 +171,14 @@ basefiles = %w(
libbase = compile(expand("core/base", basefiles), "-DADB_HOST=1 -Icore/base/include -Icore/include") libbase = compile(expand("core/base", basefiles), "-DADB_HOST=1 -Icore/base/include -Icore/include")
logfiles = %w( logfiles = %w(
fake_log_device.cpp
fake_writer.cpp
log_event_list.cpp log_event_list.cpp
log_event_write.cpp log_event_write.cpp
logger_lock.cpp
logger_name.cpp logger_name.cpp
logger_write.cpp logger_write.cpp
logprint.cpp logprint.cpp
properties.cpp
) )
liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include") liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include -Icore/base/include")
cutilsfiles = %w( cutilsfiles = %w(
android_get_control_file.cpp android_get_control_file.cpp
@ -307,12 +307,11 @@ libsepolfiles = %w(
debug.c debug.c
ebitmap.c ebitmap.c
expand.c expand.c
genbools.c
genusers.c
hashtab.c hashtab.c
hierarchy.c hierarchy.c
kernel_to_common.c kernel_to_common.c
mls.c mls.c
optimize.c
policydb.c policydb.c
policydb_convert.c policydb_convert.c
policydb_public.c policydb_public.c

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) %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 Name: android-tools
Version: 29.0.5 Version: 29.0.6
Release: 1mamba Release: 1mamba
Summary: Android platform tools Summary: Android platform tools
Group: System/Tools Group: System/Tools
@ -20,11 +20,11 @@ Source8: deployagent-29.0.5.jar
Source9: https://android.googlesource.com/platform/frameworks/base.git/platform-tools-%{version}/base-%{version}.tar.bz2 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 Source10: https://android.googlesource.com/platform/frameworks/native.git/platform-tools-%{version}/native-%{version}.tar.bz2
# From arch linux # From arch linux
Source20: android-tools-29.0.5-generate_build.rb Source20: android-tools-29.0.6-generate_build.rb
Source21: android-tools-bash_completion.fastboot Source21: android-tools-bash_completion.fastboot
Patch0: android-tools-5.0.2_r1-remove-selinux-header.patch Patch0: android-tools-5.0.2_r1-remove-selinux-header.patch
Patch1: android-tools-7.1.1_r13-fix-build.patch Patch1: android-tools-7.1.1_r13-fix-build.patch
Patch2: android-tools-29.0.5-build-core.patch Patch2: android-tools-29.0.6-build-core.patch
License: Apache License 2.0, BSD License: Apache License 2.0, BSD
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -141,6 +141,9 @@ install -Dm 644 %{SOURCE21} %{buildroot}%{_datadir}/bash-completion/completions/
%{_bindir}/mkbootimg %{_bindir}/mkbootimg
%changelog %changelog
* Fri Mar 13 2020 Automatic Build System <autodist@mambasoft.it> 29.0.6-1mamba
- automatic version update by autodist
* Sun Dec 01 2019 Automatic Build System <autodist@mambasoft.it> 29.0.5-1mamba * Sun Dec 01 2019 Automatic Build System <autodist@mambasoft.it> 29.0.5-1mamba
- automatic version update by autodist - automatic version update by autodist