[arch-commits] Commit in android-tools/repos (28 files)
Anatol Pomozov
anatolik at archlinux.org
Mon Jul 17 23:52:15 UTC 2017
Date: Monday, July 17, 2017 @ 23:52:14
Author: anatolik
Revision: 245525
archrelease: copy trunk to community-i686, community-x86_64
Added:
android-tools/repos/community-i686/PKGBUILD
(from rev 245524, android-tools/trunk/PKGBUILD)
android-tools/repos/community-i686/bash_completion.adb
(from rev 245524, android-tools/trunk/bash_completion.adb)
android-tools/repos/community-i686/bash_completion.fastboot
(from rev 245524, android-tools/trunk/bash_completion.fastboot)
android-tools/repos/community-i686/build.sh
(from rev 245524, android-tools/trunk/build.sh)
android-tools/repos/community-i686/fix_build.patch
(from rev 245524, android-tools/trunk/fix_build.patch)
android-tools/repos/community-i686/generate_build.rb
(from rev 245524, android-tools/trunk/generate_build.rb)
android-tools/repos/community-i686/openssl-1.1.0.patch
(from rev 245524, android-tools/trunk/openssl-1.1.0.patch)
android-tools/repos/community-x86_64/PKGBUILD
(from rev 245524, android-tools/trunk/PKGBUILD)
android-tools/repos/community-x86_64/bash_completion.adb
(from rev 245524, android-tools/trunk/bash_completion.adb)
android-tools/repos/community-x86_64/bash_completion.fastboot
(from rev 245524, android-tools/trunk/bash_completion.fastboot)
android-tools/repos/community-x86_64/build.sh
(from rev 245524, android-tools/trunk/build.sh)
android-tools/repos/community-x86_64/fix_build.patch
(from rev 245524, android-tools/trunk/fix_build.patch)
android-tools/repos/community-x86_64/generate_build.rb
(from rev 245524, android-tools/trunk/generate_build.rb)
android-tools/repos/community-x86_64/openssl-1.1.0.patch
(from rev 245524, android-tools/trunk/openssl-1.1.0.patch)
Deleted:
android-tools/repos/community-i686/PKGBUILD
android-tools/repos/community-i686/bash_completion.adb
android-tools/repos/community-i686/bash_completion.fastboot
android-tools/repos/community-i686/build.sh
android-tools/repos/community-i686/fix_build.patch
android-tools/repos/community-i686/generate_build.rb
android-tools/repos/community-i686/openssl-1.1.0.patch
android-tools/repos/community-x86_64/PKGBUILD
android-tools/repos/community-x86_64/bash_completion.adb
android-tools/repos/community-x86_64/bash_completion.fastboot
android-tools/repos/community-x86_64/build.sh
android-tools/repos/community-x86_64/fix_build.patch
android-tools/repos/community-x86_64/generate_build.rb
android-tools/repos/community-x86_64/openssl-1.1.0.patch
-------------------------------------------+
/PKGBUILD | 102 +++++++
/bash_completion.adb | 270 ++++++++++++++++++++
/bash_completion.fastboot | 180 +++++++++++++
/build.sh | 180 +++++++++++++
/fix_build.patch | 132 ++++++++++
/generate_build.rb | 366 ++++++++++++++++++++++++++++
/openssl-1.1.0.patch | 64 ++++
community-i686/PKGBUILD | 51 ---
community-i686/bash_completion.adb | 135 ----------
community-i686/bash_completion.fastboot | 90 ------
community-i686/build.sh | 90 ------
community-i686/fix_build.patch | 66 -----
community-i686/generate_build.rb | 183 --------------
community-i686/openssl-1.1.0.patch | 32 --
community-x86_64/PKGBUILD | 51 ---
community-x86_64/bash_completion.adb | 135 ----------
community-x86_64/bash_completion.fastboot | 90 ------
community-x86_64/build.sh | 90 ------
community-x86_64/fix_build.patch | 66 -----
community-x86_64/generate_build.rb | 183 --------------
community-x86_64/openssl-1.1.0.patch | 32 --
21 files changed, 1294 insertions(+), 1294 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-i686/PKGBUILD 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Anatol Pomozov
-# Contributor: 謝致邦 <Yeking at Red54.com>
-# Contributor: Alucryd <alucryd at gmail dot com>
-
-pkgname=android-tools
-pkgver=7.1.2_r6
-pkgrel=1
-pkgdesc='Android platform tools'
-arch=(i686 x86_64)
-url='http://tools.android.com/'
-license=(Apache MIT)
-depends=(openssl pcre)
-optdepends=('python: for mkbootimg script')
-makedepends=(git clang gtest)
-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/libselinux#tag=android-$pkgver
- git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver
- build.sh # regenerate this file with generate_build.rb tool
- fix_build.patch
- bash_completion.fastboot
- bash_completion.adb
- openssl-1.1.0.patch) # Bash completion file was taken from https://github.com/mbrubeck/android-completion
-sha1sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '84dd43a0102e35fcdf0a855c617e1d151f49fb2a'
- '33538c9161c199f1e608d3b8f519adb1cd9d46d5'
- '7004dbd0c193668827174880de6f8434de8ceaee'
- '2e69152091bb9642be058e49ec6cb720a2fd91dc'
- 'e5cad0915d4b4398783ff2b72ad079eb26747fdb')
-
-prepare() {
- patch -p1 < fix_build.patch
- cd core
- patch -Np1 -i ../openssl-1.1.0.patch
-}
-
-build() {
- PKGVER=$pkgver sh ./build.sh
-}
-
-package(){
- install -m755 -d "$pkgdir"/usr/bin
- install -m755 -t "$pkgdir"/usr/bin fastboot adb core/mkbootimg/mkbootimg
- install -Dm 644 bash_completion.fastboot "$pkgdir"/usr/share/bash-completion/completions/fastboot
- #adb completion is provided by bash-completion file now
- #install -Dm 644 bash_completion.adb "$pkgdir"/usr/share/bash-completion/completions/adb
-}
Copied: android-tools/repos/community-i686/PKGBUILD (from rev 245524, android-tools/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Anatol Pomozov
+# Contributor: 謝致邦 <Yeking at Red54.com>
+# Contributor: Alucryd <alucryd at gmail dot com>
+
+pkgname=android-tools
+pkgver=7.1.2_r27
+pkgrel=1
+pkgdesc='Android platform tools'
+arch=(i686 x86_64)
+url='http://tools.android.com/'
+license=(Apache MIT)
+depends=(openssl pcre)
+optdepends=('python: for mkbootimg script')
+makedepends=(git clang gtest)
+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/libselinux#tag=android-$pkgver
+ git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver
+ build.sh # regenerate this file with generate_build.rb tool
+ fix_build.patch
+ bash_completion.fastboot
+ bash_completion.adb
+ openssl-1.1.0.patch) # Bash completion file was taken from https://github.com/mbrubeck/android-completion
+sha1sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '524e3a1768d4386c31436210c6798a06ec636203'
+ '33538c9161c199f1e608d3b8f519adb1cd9d46d5'
+ '7004dbd0c193668827174880de6f8434de8ceaee'
+ '2e69152091bb9642be058e49ec6cb720a2fd91dc'
+ 'e5cad0915d4b4398783ff2b72ad079eb26747fdb')
+
+prepare() {
+ patch -p1 < fix_build.patch
+ cd core
+ patch -Np1 -i ../openssl-1.1.0.patch
+}
+
+build() {
+ PKGVER=$pkgver sh ./build.sh
+}
+
+package(){
+ install -m755 -d "$pkgdir"/usr/bin
+ install -m755 -t "$pkgdir"/usr/bin fastboot adb core/mkbootimg/mkbootimg
+ install -Dm 644 bash_completion.fastboot "$pkgdir"/usr/share/bash-completion/completions/fastboot
+ #adb completion is provided by bash-completion file now
+ #install -Dm 644 bash_completion.adb "$pkgdir"/usr/share/bash-completion/completions/adb
+}
Deleted: community-i686/bash_completion.adb
===================================================================
--- community-i686/bash_completion.adb 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-i686/bash_completion.adb 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,135 +0,0 @@
-## Bash completion for the Android SDK tools.
-##
-## Copyright (c) 2009 Matt Brubeck
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included in
-## all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-## THE SOFTWARE.
-
-
-function _adb()
-{
- local cur prev opts cmds c subcommand device_selected
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts="-d -e -s -p"
- cmds="devices push pull sync shell emu logcat forward jdwp install sideload \
- uninstall bugreport help version wait-for-device start-server \
- reboot reboot-bootloader \
- connect disconnect \
- kill-server get-state get-serialno status-window remount root ppp backup restore"
- cmds_not_need_device="devices help version start-server kill-server connect disconnect"
- subcommand=""
- device_selected=""
-
- # Look for the subcommand.
- c=1
- while [ $c -lt $COMP_CWORD ]; do
- word="${COMP_WORDS[c]}"
- if [ "$word" = "-d" -o "$word" = "-e" -o "$word" = "-s" ]; then
- device_selected=true
- opts="-p"
- fi
- for cmd in $cmds; do
- if [ "$cmd" = "$word" ]; then
- subcommand="$word"
- fi
- done
- c=$((++c))
- done
-
- case "${subcommand}" in
- '')
- case "${prev}" in
- -p)
- return 0;
- ;;
- -s)
- # Use 'adb devices' to list serial numbers.
- COMPREPLY=( $(compgen -W "$(adb devices |
- awk '/(device|recovery|sideload)$/{print $1}')" -- ${cur} ) )
- return 0
- ;;
- esac
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
- return 0
- ;;
- esac
- if [ -z "$device_selected" ]; then
- local num_devices=$(( $(adb devices 2>/dev/null|wc -l) - 2 ))
- if [ "$num_devices" -gt "1" ]; then
- # With multiple devices, you must choose a device first.
- COMPREPLY=( $(compgen -W "${opts} ${cmds_not_need_device}" -- ${cur}) )
- return 0
- fi
- fi
- COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
- return 0
- ;;
- install)
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "-l -r -s" -- ${cur}) )
- return 0
- ;;
- esac
- ;;
- forward)
- # Filename or installation option.
- COMPREPLY=( $(compgen -W "tcp: localabstract: localreserved: localfilesystem: dev: jdwp:" -- ${cur}) )
- return 0
- ;;
- uninstall)
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "-k" -- ${cur}) )
- return 0
- ;;
- esac
- ;;
- logcat)
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "-v -b -c -d -f -g -n -r -s" -- ${cur}) )
- return 0
- ;;
- esac
- case "${prev}" in
- -v)
- COMPREPLY=( $(compgen -W "brief process tag thread raw time long" -- ${cur}) )
- return 0
- ;;
- -b)
- COMPREPLY=( $(compgen -W "radio events main" -- ${cur}) )
- return 0
- ;;
- esac
- ;;
- backup)
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "-f -apk -noapk -obb -noobb -shared -noshared -all -system -nosystem" -- ${cur}) )
- return 0
- ;;
- esac
- ;;
- esac
-}
-complete -o default -F _adb adb
Copied: android-tools/repos/community-i686/bash_completion.adb (from rev 245524, android-tools/trunk/bash_completion.adb)
===================================================================
--- community-i686/bash_completion.adb (rev 0)
+++ community-i686/bash_completion.adb 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,135 @@
+## Bash completion for the Android SDK tools.
+##
+## Copyright (c) 2009 Matt Brubeck
+##
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+## THE SOFTWARE.
+
+
+function _adb()
+{
+ local cur prev opts cmds c subcommand device_selected
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+ opts="-d -e -s -p"
+ cmds="devices push pull sync shell emu logcat forward jdwp install sideload \
+ uninstall bugreport help version wait-for-device start-server \
+ reboot reboot-bootloader \
+ connect disconnect \
+ kill-server get-state get-serialno status-window remount root ppp backup restore"
+ cmds_not_need_device="devices help version start-server kill-server connect disconnect"
+ subcommand=""
+ device_selected=""
+
+ # Look for the subcommand.
+ c=1
+ while [ $c -lt $COMP_CWORD ]; do
+ word="${COMP_WORDS[c]}"
+ if [ "$word" = "-d" -o "$word" = "-e" -o "$word" = "-s" ]; then
+ device_selected=true
+ opts="-p"
+ fi
+ for cmd in $cmds; do
+ if [ "$cmd" = "$word" ]; then
+ subcommand="$word"
+ fi
+ done
+ c=$((++c))
+ done
+
+ case "${subcommand}" in
+ '')
+ case "${prev}" in
+ -p)
+ return 0;
+ ;;
+ -s)
+ # Use 'adb devices' to list serial numbers.
+ COMPREPLY=( $(compgen -W "$(adb devices |
+ awk '/(device|recovery|sideload)$/{print $1}')" -- ${cur} ) )
+ return 0
+ ;;
+ esac
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ if [ -z "$device_selected" ]; then
+ local num_devices=$(( $(adb devices 2>/dev/null|wc -l) - 2 ))
+ if [ "$num_devices" -gt "1" ]; then
+ # With multiple devices, you must choose a device first.
+ COMPREPLY=( $(compgen -W "${opts} ${cmds_not_need_device}" -- ${cur}) )
+ return 0
+ fi
+ fi
+ COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
+ return 0
+ ;;
+ install)
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "-l -r -s" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ ;;
+ forward)
+ # Filename or installation option.
+ COMPREPLY=( $(compgen -W "tcp: localabstract: localreserved: localfilesystem: dev: jdwp:" -- ${cur}) )
+ return 0
+ ;;
+ uninstall)
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "-k" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ ;;
+ logcat)
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "-v -b -c -d -f -g -n -r -s" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ case "${prev}" in
+ -v)
+ COMPREPLY=( $(compgen -W "brief process tag thread raw time long" -- ${cur}) )
+ return 0
+ ;;
+ -b)
+ COMPREPLY=( $(compgen -W "radio events main" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ ;;
+ backup)
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "-f -apk -noapk -obb -noobb -shared -noshared -all -system -nosystem" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ ;;
+ esac
+}
+complete -o default -F _adb adb
Deleted: community-i686/bash_completion.fastboot
===================================================================
--- community-i686/bash_completion.fastboot 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-i686/bash_completion.fastboot 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,90 +0,0 @@
-## Bash completion for the Android SDK tools.
-##
-## Copyright (c) 2009 Matt Brubeck
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included in
-## all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-## THE SOFTWARE.
-
-
-function _fastboot()
-{
- local cur prev opts cmds c subcommand device_selected
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts="-w -s -p -c -i -b -n"
- cmds="update flashall flash erase getvar boot devices \
- reboot reboot-bootloader oem continue"
- subcommand=""
- partition_list="boot recovery system userdata bootloader radio"
- device_selected=""
-
- # Look for the subcommand.
- c=1
- while [ $c -lt $COMP_CWORD ]; do
- word="${COMP_WORDS[c]}"
- if [ "$word" = "-s" ]; then
- device_selected=true
- fi
- for cmd in $cmds; do
- if [ "$cmd" = "$word" ]; then
- subcommand="$word"
- fi
- done
- c=$((++c))
- done
-
- case "${subcommand}" in
- '')
- case "${prev}" in
- -s)
- # Use 'fastboot devices' to list serial numbers.
- COMPREPLY=( $(compgen -W "$(fastboot devices|cut -f1)" -- ${cur} ) )
- return 0
- ;;
- esac
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
- return 0
- ;;
- esac
- if [ -z "$device_selected" ]; then
- local num_devices=$(( $(fastboot devices 2>/dev/null|wc -l) ))
- if [ "$num_devices" -gt "1" ]; then
- # With multiple devices, you must choose a device first.
- COMPREPLY=( $(compgen -W "-s" -- ${cur}) )
- return 0
- fi
- fi
- COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
- return 0
- ;;
- flash)
- # partition name
- COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
- return 0
- ;;
- erase)
- # partition name
- COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
- return 0
- ;;
- esac
-}
-complete -o default -F _fastboot fastboot
Copied: android-tools/repos/community-i686/bash_completion.fastboot (from rev 245524, android-tools/trunk/bash_completion.fastboot)
===================================================================
--- community-i686/bash_completion.fastboot (rev 0)
+++ community-i686/bash_completion.fastboot 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,90 @@
+## Bash completion for the Android SDK tools.
+##
+## Copyright (c) 2009 Matt Brubeck
+##
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+## THE SOFTWARE.
+
+
+function _fastboot()
+{
+ local cur prev opts cmds c subcommand device_selected
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+ opts="-w -s -p -c -i -b -n"
+ cmds="update flashall flash erase getvar boot devices \
+ reboot reboot-bootloader oem continue"
+ subcommand=""
+ partition_list="boot recovery system userdata bootloader radio"
+ device_selected=""
+
+ # Look for the subcommand.
+ c=1
+ while [ $c -lt $COMP_CWORD ]; do
+ word="${COMP_WORDS[c]}"
+ if [ "$word" = "-s" ]; then
+ device_selected=true
+ fi
+ for cmd in $cmds; do
+ if [ "$cmd" = "$word" ]; then
+ subcommand="$word"
+ fi
+ done
+ c=$((++c))
+ done
+
+ case "${subcommand}" in
+ '')
+ case "${prev}" in
+ -s)
+ # Use 'fastboot devices' to list serial numbers.
+ COMPREPLY=( $(compgen -W "$(fastboot devices|cut -f1)" -- ${cur} ) )
+ return 0
+ ;;
+ esac
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ if [ -z "$device_selected" ]; then
+ local num_devices=$(( $(fastboot devices 2>/dev/null|wc -l) ))
+ if [ "$num_devices" -gt "1" ]; then
+ # With multiple devices, you must choose a device first.
+ COMPREPLY=( $(compgen -W "-s" -- ${cur}) )
+ return 0
+ fi
+ fi
+ COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
+ return 0
+ ;;
+ flash)
+ # partition name
+ COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
+ return 0
+ ;;
+ erase)
+ # partition name
+ COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
+ return 0
+ ;;
+ esac
+}
+complete -o default -F _fastboot fastboot
Deleted: community-i686/build.sh
===================================================================
--- community-i686/build.sh 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-i686/build.sh 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,90 +0,0 @@
-# This set of commands generated by generate_build.rb script
-
-clang++ -o core/adb/adb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb.cpp
-clang++ -o core/adb/adb_auth.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_auth.cpp
-clang++ -o core/adb/adb_io.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_io.cpp
-clang++ -o core/adb/adb_listeners.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_listeners.cpp
-clang++ -o core/adb/adb_trace.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_trace.cpp
-clang++ -o core/adb/adb_utils.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_utils.cpp
-clang++ -o core/adb/bugreport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/bugreport.cpp
-clang++ -o core/adb/line_printer.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/line_printer.cpp
-clang++ -o core/adb/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/sockets.cpp
-clang++ -o core/adb/transport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport.cpp
-clang++ -o core/adb/transport_local.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport_local.cpp
-clang++ -o core/adb/transport_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport_usb.cpp
-clang++ -o core/adb/sysdeps_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/sysdeps_unix.cpp
-clang++ -o core/adb/fdevent.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/fdevent.cpp
-clang++ -o core/adb/get_my_path_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/get_my_path_linux.cpp
-clang++ -o core/adb/usb_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/usb_linux.cpp
-clang++ -o core/adb/adb_auth_host.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_auth_host.cpp
-clang++ -o core/adb/shell_service_protocol.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/shell_service_protocol.cpp
-clang++ -o core/adb/console.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/console.cpp
-clang++ -o core/adb/commandline.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/commandline.cpp
-clang++ -o core/adb/adb_client.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_client.cpp
-clang++ -o core/adb/services.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/services.cpp
-clang++ -o core/adb/file_sync_client.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/file_sync_client.cpp
-clang++ -o core/adb/client/main.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/client/main.cpp
-clang++ -o core/base/file.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/file.cpp
-clang++ -o core/base/logging.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/logging.cpp
-clang++ -o core/base/parsenetaddress.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/parsenetaddress.cpp
-clang++ -o core/base/stringprintf.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/stringprintf.cpp
-clang++ -o core/base/strings.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/strings.cpp
-clang++ -o core/base/errors_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/errors_unix.cpp
-clang -o core/liblog/log_event_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/log_event_write.c
-clang -o core/liblog/fake_log_device.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/fake_log_device.c
-clang -o core/liblog/log_event_list.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/log_event_list.c
-clang -o core/liblog/logger_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_write.c
-clang -o core/liblog/config_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/config_write.c
-clang -o core/liblog/logger_lock.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_lock.c
-clang -o core/liblog/fake_writer.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/fake_writer.c
-clang -o core/liblog/logger_name.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_name.c
-clang -o core/libcutils/load_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/load_file.c
-clang -o core/libcutils/socket_local_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_local_client_unix.c
-clang -o core/libcutils/socket_loopback_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_client_unix.c
-clang -o core/libcutils/socket_network_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_network_client_unix.c
-clang -o core/libcutils/socket_loopback_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_server_unix.c
-clang -o core/libcutils/socket_local_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_local_server_unix.c
-clang++ -o core/libcutils/sockets_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/sockets_unix.cpp
-clang -o core/libcutils/socket_inaddr_any_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_inaddr_any_server_unix.c
-clang++ -o core/libcutils/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/sockets.cpp
-clang++ -o core/adb/diagnose_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/include -Icore/base/include -c core/adb/diagnose_usb.cpp
-g++ -o adb -lpthread -lcrypto $LDFLAGS core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/libcutils/load_file.c.o core/libcutils/socket_local_client_unix.c.o core/libcutils/socket_loopback_client_unix.c.o core/libcutils/socket_network_client_unix.c.o core/libcutils/socket_loopback_server_unix.c.o core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o core/adb/adb.cpp.o core/adb/adb_auth.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o core/adb/bugreport.cpp.o core/adb/line_printer.cpp
.o core/adb/sockets.cpp.o core/adb/transport.cpp.o core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o core/adb/sysdeps_unix.cpp.o core/adb/fdevent.cpp.o core/adb/get_my_path_linux.cpp.o core/adb/usb_linux.cpp.o core/adb/adb_auth_host.cpp.o core/adb/shell_service_protocol.cpp.o core/adb/console.cpp.o core/adb/commandline.cpp.o core/adb/adb_client.cpp.o core/adb/services.cpp.o core/adb/file_sync_client.cpp.o core/adb/client/main.cpp.o core/adb/diagnose_usb.cpp.o
-clang++ -o core/fastboot/protocol.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/protocol.cpp
-clang++ -o core/fastboot/engine.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/engine.cpp
-clang++ -o core/fastboot/bootimg_utils.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/bootimg_utils.cpp
-clang++ -o core/fastboot/fastboot.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/fastboot.cpp
-clang++ -o core/fastboot/util.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/util.cpp
-clang++ -o core/fastboot/fs.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/fs.cpp
-clang++ -o core/fastboot/usb_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/usb_linux.cpp
-clang++ -o core/fastboot/util_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/util_linux.cpp
-clang++ -o core/fastboot/socket.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/socket.cpp
-clang++ -o core/fastboot/tcp.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/tcp.cpp
-clang++ -o core/fastboot/udp.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/udp.cpp
-clang -o core/libsparse/backed_block.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/backed_block.c
-clang -o core/libsparse/output_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/output_file.c
-clang -o core/libsparse/sparse.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse.c
-clang -o core/libsparse/sparse_crc32.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_crc32.c
-clang -o core/libsparse/sparse_err.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_err.c
-clang -o core/libsparse/sparse_read.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_read.c
-clang++ -o core/libziparchive/zip_archive.cc.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/base/include -Icore/include -c core/libziparchive/zip_archive.cc
-clang++ -o core/libutils/FileMap.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/include -c core/libutils/FileMap.cpp
-clang -o extras/ext4_utils/make_ext4fs.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/make_ext4fs.c
-clang -o extras/ext4_utils/ext4fixup.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4fixup.c
-clang -o extras/ext4_utils/ext4_utils.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4_utils.c
-clang -o extras/ext4_utils/allocate.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/allocate.c
-clang -o extras/ext4_utils/contents.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/contents.c
-clang -o extras/ext4_utils/extent.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/extent.c
-clang -o extras/ext4_utils/indirect.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/indirect.c
-clang -o extras/ext4_utils/sha1.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/sha1.c
-clang -o extras/ext4_utils/wipe.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/wipe.c
-clang -o extras/ext4_utils/crc16.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/crc16.c
-clang -o extras/ext4_utils/ext4_sb.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4_sb.c
-clang -o libselinux/src/callbacks.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/callbacks.c
-clang -o libselinux/src/check_context.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/check_context.c
-clang -o libselinux/src/freecon.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/freecon.c
-clang -o libselinux/src/init.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/init.c
-clang -o libselinux/src/label.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label.c
-clang -o libselinux/src/label_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_file.c
-clang -o libselinux/src/label_android_property.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_android_property.c
-clang -o libselinux/src/label_support.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_support.c
-g++ -o fastboot -lz -lpcre -lpthread $LDFLAGS core/libsparse/backed_block.c.o core/libsparse/output_file.c.o core/libsparse/sparse.c.o core/libsparse/sparse_crc32.c.o core/libsparse/sparse_err.c.o core/libsparse/sparse_read.c.o core/libziparchive/zip_archive.cc.o core/libcutils/load_file.c.o core/libcutils/socket_local_client_unix.c.o core/libcutils/socket_loopback_client_unix.c.o core/libcutils/socket_network_client_unix.c.o core/libcutils/socket_loopback_server_unix.c.o core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/libutils/FileMap.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf
.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o extras/ext4_utils/make_ext4fs.c.o extras/ext4_utils/ext4fixup.c.o extras/ext4_utils/ext4_utils.c.o extras/ext4_utils/allocate.c.o extras/ext4_utils/contents.c.o extras/ext4_utils/extent.c.o extras/ext4_utils/indirect.c.o extras/ext4_utils/sha1.c.o extras/ext4_utils/wipe.c.o extras/ext4_utils/crc16.c.o extras/ext4_utils/ext4_sb.c.o libselinux/src/callbacks.c.o libselinux/src/check_context.c.o libselinux/src/freecon.c.o libselinux/src/init.c.o libselinux/src/label.c.o libselinux/src/label_file.c.o libselinux/src/label_android_property.c.o libselinux/src/label_support.c.o core/fastboot/protocol.cpp.o core/fastboot/engine.cpp.o core/fastboot/bootimg_utils.cpp.o core/fastboot/fastboot.cpp.o core/fastboot/util.cpp.o core/fastboot/fs.cpp.o core/fastboot/usb_linux.cpp.o core/fastboot/util_linux.cpp.o core/fastboot/socket.cpp.o core/fastboot/tcp.cpp.o core/fastboot/udp.cpp.o core/adb/diagnose_usb.cpp.o
Copied: android-tools/repos/community-i686/build.sh (from rev 245524, android-tools/trunk/build.sh)
===================================================================
--- community-i686/build.sh (rev 0)
+++ community-i686/build.sh 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,90 @@
+# This set of commands generated by generate_build.rb script
+
+clang++ -o core/adb/adb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb.cpp
+clang++ -o core/adb/adb_auth.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_auth.cpp
+clang++ -o core/adb/adb_io.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_io.cpp
+clang++ -o core/adb/adb_listeners.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_listeners.cpp
+clang++ -o core/adb/adb_trace.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_trace.cpp
+clang++ -o core/adb/adb_utils.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_utils.cpp
+clang++ -o core/adb/bugreport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/bugreport.cpp
+clang++ -o core/adb/line_printer.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/line_printer.cpp
+clang++ -o core/adb/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/sockets.cpp
+clang++ -o core/adb/transport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport.cpp
+clang++ -o core/adb/transport_local.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport_local.cpp
+clang++ -o core/adb/transport_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport_usb.cpp
+clang++ -o core/adb/sysdeps_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/sysdeps_unix.cpp
+clang++ -o core/adb/fdevent.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/fdevent.cpp
+clang++ -o core/adb/get_my_path_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/get_my_path_linux.cpp
+clang++ -o core/adb/usb_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/usb_linux.cpp
+clang++ -o core/adb/adb_auth_host.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_auth_host.cpp
+clang++ -o core/adb/shell_service_protocol.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/shell_service_protocol.cpp
+clang++ -o core/adb/console.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/console.cpp
+clang++ -o core/adb/commandline.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/commandline.cpp
+clang++ -o core/adb/adb_client.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_client.cpp
+clang++ -o core/adb/services.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/services.cpp
+clang++ -o core/adb/file_sync_client.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/file_sync_client.cpp
+clang++ -o core/adb/client/main.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/client/main.cpp
+clang++ -o core/base/file.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/file.cpp
+clang++ -o core/base/logging.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/logging.cpp
+clang++ -o core/base/parsenetaddress.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/parsenetaddress.cpp
+clang++ -o core/base/stringprintf.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/stringprintf.cpp
+clang++ -o core/base/strings.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/strings.cpp
+clang++ -o core/base/errors_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/errors_unix.cpp
+clang -o core/liblog/log_event_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/log_event_write.c
+clang -o core/liblog/fake_log_device.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/fake_log_device.c
+clang -o core/liblog/log_event_list.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/log_event_list.c
+clang -o core/liblog/logger_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_write.c
+clang -o core/liblog/config_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/config_write.c
+clang -o core/liblog/logger_lock.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_lock.c
+clang -o core/liblog/fake_writer.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/fake_writer.c
+clang -o core/liblog/logger_name.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_name.c
+clang -o core/libcutils/load_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/load_file.c
+clang -o core/libcutils/socket_local_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_local_client_unix.c
+clang -o core/libcutils/socket_loopback_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_client_unix.c
+clang -o core/libcutils/socket_network_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_network_client_unix.c
+clang -o core/libcutils/socket_loopback_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_server_unix.c
+clang -o core/libcutils/socket_local_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_local_server_unix.c
+clang++ -o core/libcutils/sockets_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/sockets_unix.cpp
+clang -o core/libcutils/socket_inaddr_any_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_inaddr_any_server_unix.c
+clang++ -o core/libcutils/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/sockets.cpp
+clang++ -o core/adb/diagnose_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/include -Icore/base/include -c core/adb/diagnose_usb.cpp
+clang++ -o adb -lpthread -lcrypto $LDFLAGS core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/libcutils/load_file.c.o core/libcutils/socket_local_client_unix.c.o core/libcutils/socket_loopback_client_unix.c.o core/libcutils/socket_network_client_unix.c.o core/libcutils/socket_loopback_server_unix.c.o core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o core/adb/adb.cpp.o core/adb/adb_auth.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o core/adb/bugreport.cpp.o core/adb/line_printer
.cpp.o core/adb/sockets.cpp.o core/adb/transport.cpp.o core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o core/adb/sysdeps_unix.cpp.o core/adb/fdevent.cpp.o core/adb/get_my_path_linux.cpp.o core/adb/usb_linux.cpp.o core/adb/adb_auth_host.cpp.o core/adb/shell_service_protocol.cpp.o core/adb/console.cpp.o core/adb/commandline.cpp.o core/adb/adb_client.cpp.o core/adb/services.cpp.o core/adb/file_sync_client.cpp.o core/adb/client/main.cpp.o core/adb/diagnose_usb.cpp.o
+clang++ -o core/fastboot/protocol.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/protocol.cpp
+clang++ -o core/fastboot/engine.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/engine.cpp
+clang++ -o core/fastboot/bootimg_utils.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/bootimg_utils.cpp
+clang++ -o core/fastboot/fastboot.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/fastboot.cpp
+clang++ -o core/fastboot/util.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/util.cpp
+clang++ -o core/fastboot/fs.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/fs.cpp
+clang++ -o core/fastboot/usb_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/usb_linux.cpp
+clang++ -o core/fastboot/util_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/util_linux.cpp
+clang++ -o core/fastboot/socket.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/socket.cpp
+clang++ -o core/fastboot/tcp.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/tcp.cpp
+clang++ -o core/fastboot/udp.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/udp.cpp
+clang -o core/libsparse/backed_block.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/backed_block.c
+clang -o core/libsparse/output_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/output_file.c
+clang -o core/libsparse/sparse.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse.c
+clang -o core/libsparse/sparse_crc32.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_crc32.c
+clang -o core/libsparse/sparse_err.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_err.c
+clang -o core/libsparse/sparse_read.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_read.c
+clang++ -o core/libziparchive/zip_archive.cc.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/base/include -Icore/include -c core/libziparchive/zip_archive.cc
+clang++ -o core/libutils/FileMap.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/include -c core/libutils/FileMap.cpp
+clang -o extras/ext4_utils/make_ext4fs.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/make_ext4fs.c
+clang -o extras/ext4_utils/ext4fixup.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4fixup.c
+clang -o extras/ext4_utils/ext4_utils.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4_utils.c
+clang -o extras/ext4_utils/allocate.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/allocate.c
+clang -o extras/ext4_utils/contents.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/contents.c
+clang -o extras/ext4_utils/extent.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/extent.c
+clang -o extras/ext4_utils/indirect.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/indirect.c
+clang -o extras/ext4_utils/sha1.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/sha1.c
+clang -o extras/ext4_utils/wipe.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/wipe.c
+clang -o extras/ext4_utils/crc16.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/crc16.c
+clang -o extras/ext4_utils/ext4_sb.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4_sb.c
+clang -o libselinux/src/callbacks.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/callbacks.c
+clang -o libselinux/src/check_context.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/check_context.c
+clang -o libselinux/src/freecon.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/freecon.c
+clang -o libselinux/src/init.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/init.c
+clang -o libselinux/src/label.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label.c
+clang -o libselinux/src/label_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_file.c
+clang -o libselinux/src/label_android_property.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_android_property.c
+clang -o libselinux/src/label_support.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_support.c
+clang++ -o fastboot -lz -lpcre -lpthread $LDFLAGS core/libsparse/backed_block.c.o core/libsparse/output_file.c.o core/libsparse/sparse.c.o core/libsparse/sparse_crc32.c.o core/libsparse/sparse_err.c.o core/libsparse/sparse_read.c.o core/libziparchive/zip_archive.cc.o core/libcutils/load_file.c.o core/libcutils/socket_local_client_unix.c.o core/libcutils/socket_loopback_client_unix.c.o core/libcutils/socket_network_client_unix.c.o core/libcutils/socket_loopback_server_unix.c.o core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/libutils/FileMap.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringpr
intf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o extras/ext4_utils/make_ext4fs.c.o extras/ext4_utils/ext4fixup.c.o extras/ext4_utils/ext4_utils.c.o extras/ext4_utils/allocate.c.o extras/ext4_utils/contents.c.o extras/ext4_utils/extent.c.o extras/ext4_utils/indirect.c.o extras/ext4_utils/sha1.c.o extras/ext4_utils/wipe.c.o extras/ext4_utils/crc16.c.o extras/ext4_utils/ext4_sb.c.o libselinux/src/callbacks.c.o libselinux/src/check_context.c.o libselinux/src/freecon.c.o libselinux/src/init.c.o libselinux/src/label.c.o libselinux/src/label_file.c.o libselinux/src/label_android_property.c.o libselinux/src/label_support.c.o core/fastboot/protocol.cpp.o core/fastboot/engine.cpp.o core/fastboot/bootimg_utils.cpp.o core/fastboot/fastboot.cpp.o core/fastboot/util.cpp.o core/fastboot/fs.cpp.o core/fastboot/usb_linux.cpp.o core/fastboot/util_linux.cpp.o core/fastboot/socket.cpp.o core/fastboot/tcp.cpp.o core/fastboot/udp.cpp.o core/adb/diagnose_usb.cpp.o
Deleted: community-i686/fix_build.patch
===================================================================
--- community-i686/fix_build.patch 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-i686/fix_build.patch 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,66 +0,0 @@
-diff --git a/core/adb/sysdeps.h b/core/adb/sysdeps.h
-index 75dcc86..867f3ec 100644
---- a/core/adb/sysdeps.h
-+++ b/core/adb/sysdeps.h
-@@ -25,6 +25,7 @@
- #endif
-
- #include <errno.h>
-+#include <sys/syscall.h>
-
- #include <string>
- #include <vector>
-@@ -831,7 +832,16 @@ static __inline__ int adb_is_absolute_host_path(const char* path) {
-
- static __inline__ unsigned long adb_thread_id()
- {
-- return (unsigned long)gettid();
-+ // TODO: this function should be merged with GetThreadId
-+#if defined(__BIONIC__)
-+ return gettid();
-+#elif defined(__APPLE__)
-+ return syscall(SYS_thread_selfid);
-+#elif defined(__linux__)
-+ return syscall(__NR_gettid);
-+#elif defined(_WIN32)
-+ return GetCurrentThreadId();
-+#endif
- }
-
- #endif /* !_WIN32 */
-diff --git a/core/base/errors_unix.cpp b/core/base/errors_unix.cpp
-index 296995e..48269b6 100644
---- a/core/base/errors_unix.cpp
-+++ b/core/base/errors_unix.cpp
-@@ -17,6 +17,7 @@
- #include "android-base/errors.h"
-
- #include <errno.h>
-+#include <string.h>
-
- namespace android {
- namespace base {
-diff --git a/core/base/file.cpp b/core/base/file.cpp
-index da1adba..91a3901 100644
---- a/core/base/file.cpp
-+++ b/core/base/file.cpp
-@@ -20,6 +20,7 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <string.h>
-
- #include <string>
-
-diff --git a/core/base/logging.cpp b/core/base/logging.cpp
-index 1741871..e97c7f1 100644
---- a/core/base/logging.cpp
-+++ b/core/base/logging.cpp
-@@ -21,6 +21,7 @@
- #include "android-base/logging.h"
-
- #include <libgen.h>
-+#include <string.h>
-
- // For getprogname(3) or program_invocation_short_name.
- #if defined(__ANDROID__) || defined(__APPLE__)
Copied: android-tools/repos/community-i686/fix_build.patch (from rev 245524, android-tools/trunk/fix_build.patch)
===================================================================
--- community-i686/fix_build.patch (rev 0)
+++ community-i686/fix_build.patch 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,66 @@
+diff --git a/core/adb/sysdeps.h b/core/adb/sysdeps.h
+index 75dcc86..867f3ec 100644
+--- a/core/adb/sysdeps.h
++++ b/core/adb/sysdeps.h
+@@ -25,6 +25,7 @@
+ #endif
+
+ #include <errno.h>
++#include <sys/syscall.h>
+
+ #include <string>
+ #include <vector>
+@@ -831,7 +832,16 @@ static __inline__ int adb_is_absolute_host_path(const char* path) {
+
+ static __inline__ unsigned long adb_thread_id()
+ {
+- return (unsigned long)gettid();
++ // TODO: this function should be merged with GetThreadId
++#if defined(__BIONIC__)
++ return gettid();
++#elif defined(__APPLE__)
++ return syscall(SYS_thread_selfid);
++#elif defined(__linux__)
++ return syscall(__NR_gettid);
++#elif defined(_WIN32)
++ return GetCurrentThreadId();
++#endif
+ }
+
+ #endif /* !_WIN32 */
+diff --git a/core/base/errors_unix.cpp b/core/base/errors_unix.cpp
+index 296995e..48269b6 100644
+--- a/core/base/errors_unix.cpp
++++ b/core/base/errors_unix.cpp
+@@ -17,6 +17,7 @@
+ #include "android-base/errors.h"
+
+ #include <errno.h>
++#include <string.h>
+
+ namespace android {
+ namespace base {
+diff --git a/core/base/file.cpp b/core/base/file.cpp
+index da1adba..91a3901 100644
+--- a/core/base/file.cpp
++++ b/core/base/file.cpp
+@@ -20,6 +20,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <string.h>
+
+ #include <string>
+
+diff --git a/core/base/logging.cpp b/core/base/logging.cpp
+index 1741871..e97c7f1 100644
+--- a/core/base/logging.cpp
++++ b/core/base/logging.cpp
+@@ -21,6 +21,7 @@
+ #include "android-base/logging.h"
+
+ #include <libgen.h>
++#include <string.h>
+
+ // For getprogname(3) or program_invocation_short_name.
+ #if defined(__ANDROID__) || defined(__APPLE__)
Deleted: community-i686/generate_build.rb
===================================================================
--- community-i686/generate_build.rb 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-i686/generate_build.rb 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,183 +0,0 @@
-#!/usr/bin/ruby
-
-# Android build system is complicated and does not allow to build
-# separate parts easily.
-# This script tries to mimic Android build rules.
-
-def expand(dir, files)
- files.map{|f| File.join(dir,f)}
-end
-
-# Compiles sources to *.o files.
-# Returns array of output *.o filenames
-def compile(sources, cflags)
- outputs = []
- for s in sources
- ext = File.extname(s)
-
- case ext
- when '.c'
- cc = 'clang'
- lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
- when '.cpp', '.cc'
- cc = 'clang++'
- lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
- else
- raise "Unknown extension #{ext}"
- end
-
- output = s + '.o'
- outputs << output
- puts "#{cc} -o #{output} #{lang_flags} #{cflags} -c #{s}\n"
- end
-
- return outputs
-end
-
-# Links object files
-def link(output, objects, ldflags)
- puts "g++ -o #{output} #{ldflags} $LDFLAGS #{objects.join(' ')}"
-end
-
-puts "# This set of commands generated by generate_build.rb script\n\n"
-
-adbdfiles = %w(
- adb.cpp
- adb_auth.cpp
- adb_io.cpp
- adb_listeners.cpp
- adb_trace.cpp
- adb_utils.cpp
- bugreport.cpp
- line_printer.cpp
- sockets.cpp
- transport.cpp
- transport_local.cpp
- transport_usb.cpp
- sysdeps_unix.cpp
-
- fdevent.cpp
- get_my_path_linux.cpp
- usb_linux.cpp
-
- adb_auth_host.cpp
- shell_service_protocol.cpp
-)
-libadbd = compile(expand('core/adb', adbdfiles), '-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb')
-
-adbfiles = %w(
- console.cpp
- commandline.cpp
- adb_client.cpp
- services.cpp
- file_sync_client.cpp
- client/main.cpp
-)
-libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb')
-
-basefiles = %w(
- file.cpp
- logging.cpp
- parsenetaddress.cpp
- stringprintf.cpp
- strings.cpp
- errors_unix.cpp
-)
-libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include')
-
-logfiles = %w(
- log_event_write.c
- fake_log_device.c
- log_event_list.c
- logger_write.c
- config_write.c
- logger_lock.c
- fake_writer.c
- logger_name.c
-)
-liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include')
-
-cutilsfiles = %w(
- load_file.c
- socket_local_client_unix.c
- socket_loopback_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
- sockets.cpp
-)
-libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/include')
-
-diagnoseusbfiles = %w(
- diagnose_usb.cpp
-)
-libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include')
-
-link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb, '-lpthread -lcrypto')
-
-
-fastbootfiles = %w(
- protocol.cpp
- engine.cpp
- bootimg_utils.cpp
- fastboot.cpp
- util.cpp
- fs.cpp
- usb_linux.cpp
- util_linux.cpp
- socket.cpp
- tcp.cpp
- udp.cpp
-)
-libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils')
-
-sparsefiles = %w(
- backed_block.c
- output_file.c
- sparse.c
- sparse_crc32.c
- sparse_err.c
- sparse_read.c
-)
-libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include')
-
-zipfiles = %w(
- zip_archive.cc
-)
-libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include')
-
-utilfiles = %w(
- FileMap.cpp
-)
-libutil = compile(expand('core/libutils', utilfiles), '-Icore/include')
-
-ext4files = %w(
- make_ext4fs.c
- ext4fixup.c
- ext4_utils.c
- allocate.c
- contents.c
- extent.c
- indirect.c
- sha1.c
- wipe.c
- crc16.c
- ext4_sb.c
-)
-libext4 = compile(expand('extras/ext4_utils', ext4files), '-Icore/libsparse/include -Icore/include -Ilibselinux/include')
-
-selinuxfiles = %w(
- src/callbacks.c
- src/check_context.c
- src/freecon.c
- src/init.c
- src/label.c
- src/label_file.c
- src/label_android_property.c
- src/label_support.c
-)
-libselinux = compile(expand('libselinux', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include')
-
-link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + libselinux + libfastboot + libdiagnoseusb, '-lz -lpcre -lpthread')
Copied: android-tools/repos/community-i686/generate_build.rb (from rev 245524, android-tools/trunk/generate_build.rb)
===================================================================
--- community-i686/generate_build.rb (rev 0)
+++ community-i686/generate_build.rb 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,183 @@
+#!/usr/bin/ruby
+
+# Android build system is complicated and does not allow to build
+# separate parts easily.
+# This script tries to mimic Android build rules.
+
+def expand(dir, files)
+ files.map{|f| File.join(dir,f)}
+end
+
+# Compiles sources to *.o files.
+# Returns array of output *.o filenames
+def compile(sources, cflags)
+ outputs = []
+ for s in sources
+ ext = File.extname(s)
+
+ case ext
+ when '.c'
+ cc = 'clang'
+ lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
+ when '.cpp', '.cc'
+ cc = 'clang++'
+ lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
+ else
+ raise "Unknown extension #{ext}"
+ end
+
+ output = s + '.o'
+ outputs << output
+ puts "#{cc} -o #{output} #{lang_flags} #{cflags} -c #{s}\n"
+ end
+
+ return outputs
+end
+
+# Links object files
+def link(output, objects, ldflags)
+ puts "clang++ -o #{output} #{ldflags} $LDFLAGS #{objects.join(' ')}"
+end
+
+puts "# This set of commands generated by generate_build.rb script\n\n"
+
+adbdfiles = %w(
+ adb.cpp
+ adb_auth.cpp
+ adb_io.cpp
+ adb_listeners.cpp
+ adb_trace.cpp
+ adb_utils.cpp
+ bugreport.cpp
+ line_printer.cpp
+ sockets.cpp
+ transport.cpp
+ transport_local.cpp
+ transport_usb.cpp
+ sysdeps_unix.cpp
+
+ fdevent.cpp
+ get_my_path_linux.cpp
+ usb_linux.cpp
+
+ adb_auth_host.cpp
+ shell_service_protocol.cpp
+)
+libadbd = compile(expand('core/adb', adbdfiles), '-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb')
+
+adbfiles = %w(
+ console.cpp
+ commandline.cpp
+ adb_client.cpp
+ services.cpp
+ file_sync_client.cpp
+ client/main.cpp
+)
+libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb')
+
+basefiles = %w(
+ file.cpp
+ logging.cpp
+ parsenetaddress.cpp
+ stringprintf.cpp
+ strings.cpp
+ errors_unix.cpp
+)
+libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include')
+
+logfiles = %w(
+ log_event_write.c
+ fake_log_device.c
+ log_event_list.c
+ logger_write.c
+ config_write.c
+ logger_lock.c
+ fake_writer.c
+ logger_name.c
+)
+liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include')
+
+cutilsfiles = %w(
+ load_file.c
+ socket_local_client_unix.c
+ socket_loopback_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
+ sockets.cpp
+)
+libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/include')
+
+diagnoseusbfiles = %w(
+ diagnose_usb.cpp
+)
+libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include')
+
+link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb, '-lpthread -lcrypto')
+
+
+fastbootfiles = %w(
+ protocol.cpp
+ engine.cpp
+ bootimg_utils.cpp
+ fastboot.cpp
+ util.cpp
+ fs.cpp
+ usb_linux.cpp
+ util_linux.cpp
+ socket.cpp
+ tcp.cpp
+ udp.cpp
+)
+libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils')
+
+sparsefiles = %w(
+ backed_block.c
+ output_file.c
+ sparse.c
+ sparse_crc32.c
+ sparse_err.c
+ sparse_read.c
+)
+libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include')
+
+zipfiles = %w(
+ zip_archive.cc
+)
+libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include')
+
+utilfiles = %w(
+ FileMap.cpp
+)
+libutil = compile(expand('core/libutils', utilfiles), '-Icore/include')
+
+ext4files = %w(
+ make_ext4fs.c
+ ext4fixup.c
+ ext4_utils.c
+ allocate.c
+ contents.c
+ extent.c
+ indirect.c
+ sha1.c
+ wipe.c
+ crc16.c
+ ext4_sb.c
+)
+libext4 = compile(expand('extras/ext4_utils', ext4files), '-Icore/libsparse/include -Icore/include -Ilibselinux/include')
+
+selinuxfiles = %w(
+ src/callbacks.c
+ src/check_context.c
+ src/freecon.c
+ src/init.c
+ src/label.c
+ src/label_file.c
+ src/label_android_property.c
+ src/label_support.c
+)
+libselinux = compile(expand('libselinux', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include')
+
+link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + libselinux + libfastboot + libdiagnoseusb, '-lz -lpcre -lpthread')
Deleted: community-i686/openssl-1.1.0.patch
===================================================================
--- community-i686/openssl-1.1.0.patch 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-i686/openssl-1.1.0.patch 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,32 +0,0 @@
-diff --git a/adb/adb_auth_host.cpp b/adb/adb_auth_host.cpp
-index 7b6671d73..d9fc00f86 100644
---- a/adb/adb_auth_host.cpp
-+++ b/adb/adb_auth_host.cpp
-@@ -71,6 +71,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
- BIGNUM* rem = BN_new();
- BIGNUM* n = BN_new();
- BIGNUM* n0inv = BN_new();
-+ const BIGNUM* rsa_n;
-+ const BIGNUM* rsa_e;
-
- if (RSA_size(rsa) != RSANUMBYTES) {
- ret = 0;
-@@ -78,7 +80,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
- }
-
- BN_set_bit(r32, 32);
-- BN_copy(n, rsa->n);
-+ RSA_get0_key (rsa, &rsa_n, &rsa_e, NULL);
-+ BN_copy(n, rsa_n);
- BN_set_bit(r, RSANUMWORDS * 32);
- BN_mod_sqr(rr, r, n, ctx);
- BN_div(NULL, rem, n, r32, ctx);
-@@ -92,7 +95,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
- BN_div(n, rem, n, r32, ctx);
- pkey->n[i] = BN_get_word(rem);
- }
-- pkey->exponent = BN_get_word(rsa->e);
-+ pkey->exponent = BN_get_word(rsa_e);
-
- out:
- BN_free(n0inv);
Copied: android-tools/repos/community-i686/openssl-1.1.0.patch (from rev 245524, android-tools/trunk/openssl-1.1.0.patch)
===================================================================
--- community-i686/openssl-1.1.0.patch (rev 0)
+++ community-i686/openssl-1.1.0.patch 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,32 @@
+diff --git a/adb/adb_auth_host.cpp b/adb/adb_auth_host.cpp
+index 7b6671d73..d9fc00f86 100644
+--- a/adb/adb_auth_host.cpp
++++ b/adb/adb_auth_host.cpp
+@@ -71,6 +71,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+ BIGNUM* rem = BN_new();
+ BIGNUM* n = BN_new();
+ BIGNUM* n0inv = BN_new();
++ const BIGNUM* rsa_n;
++ const BIGNUM* rsa_e;
+
+ if (RSA_size(rsa) != RSANUMBYTES) {
+ ret = 0;
+@@ -78,7 +80,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+ }
+
+ BN_set_bit(r32, 32);
+- BN_copy(n, rsa->n);
++ RSA_get0_key (rsa, &rsa_n, &rsa_e, NULL);
++ BN_copy(n, rsa_n);
+ BN_set_bit(r, RSANUMWORDS * 32);
+ BN_mod_sqr(rr, r, n, ctx);
+ BN_div(NULL, rem, n, r32, ctx);
+@@ -92,7 +95,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+ BN_div(n, rem, n, r32, ctx);
+ pkey->n[i] = BN_get_word(rem);
+ }
+- pkey->exponent = BN_get_word(rsa->e);
++ pkey->exponent = BN_get_word(rsa_e);
+
+ out:
+ BN_free(n0inv);
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-x86_64/PKGBUILD 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Anatol Pomozov
-# Contributor: 謝致邦 <Yeking at Red54.com>
-# Contributor: Alucryd <alucryd at gmail dot com>
-
-pkgname=android-tools
-pkgver=7.1.2_r6
-pkgrel=1
-pkgdesc='Android platform tools'
-arch=(i686 x86_64)
-url='http://tools.android.com/'
-license=(Apache MIT)
-depends=(openssl pcre)
-optdepends=('python: for mkbootimg script')
-makedepends=(git clang gtest)
-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/libselinux#tag=android-$pkgver
- git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver
- build.sh # regenerate this file with generate_build.rb tool
- fix_build.patch
- bash_completion.fastboot
- bash_completion.adb
- openssl-1.1.0.patch) # Bash completion file was taken from https://github.com/mbrubeck/android-completion
-sha1sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '84dd43a0102e35fcdf0a855c617e1d151f49fb2a'
- '33538c9161c199f1e608d3b8f519adb1cd9d46d5'
- '7004dbd0c193668827174880de6f8434de8ceaee'
- '2e69152091bb9642be058e49ec6cb720a2fd91dc'
- 'e5cad0915d4b4398783ff2b72ad079eb26747fdb')
-
-prepare() {
- patch -p1 < fix_build.patch
- cd core
- patch -Np1 -i ../openssl-1.1.0.patch
-}
-
-build() {
- PKGVER=$pkgver sh ./build.sh
-}
-
-package(){
- install -m755 -d "$pkgdir"/usr/bin
- install -m755 -t "$pkgdir"/usr/bin fastboot adb core/mkbootimg/mkbootimg
- install -Dm 644 bash_completion.fastboot "$pkgdir"/usr/share/bash-completion/completions/fastboot
- #adb completion is provided by bash-completion file now
- #install -Dm 644 bash_completion.adb "$pkgdir"/usr/share/bash-completion/completions/adb
-}
Copied: android-tools/repos/community-x86_64/PKGBUILD (from rev 245524, android-tools/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Anatol Pomozov
+# Contributor: 謝致邦 <Yeking at Red54.com>
+# Contributor: Alucryd <alucryd at gmail dot com>
+
+pkgname=android-tools
+pkgver=7.1.2_r27
+pkgrel=1
+pkgdesc='Android platform tools'
+arch=(i686 x86_64)
+url='http://tools.android.com/'
+license=(Apache MIT)
+depends=(openssl pcre)
+optdepends=('python: for mkbootimg script')
+makedepends=(git clang gtest)
+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/libselinux#tag=android-$pkgver
+ git+https://android.googlesource.com/platform/external/f2fs-tools#tag=android-$pkgver
+ build.sh # regenerate this file with generate_build.rb tool
+ fix_build.patch
+ bash_completion.fastboot
+ bash_completion.adb
+ openssl-1.1.0.patch) # Bash completion file was taken from https://github.com/mbrubeck/android-completion
+sha1sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '524e3a1768d4386c31436210c6798a06ec636203'
+ '33538c9161c199f1e608d3b8f519adb1cd9d46d5'
+ '7004dbd0c193668827174880de6f8434de8ceaee'
+ '2e69152091bb9642be058e49ec6cb720a2fd91dc'
+ 'e5cad0915d4b4398783ff2b72ad079eb26747fdb')
+
+prepare() {
+ patch -p1 < fix_build.patch
+ cd core
+ patch -Np1 -i ../openssl-1.1.0.patch
+}
+
+build() {
+ PKGVER=$pkgver sh ./build.sh
+}
+
+package(){
+ install -m755 -d "$pkgdir"/usr/bin
+ install -m755 -t "$pkgdir"/usr/bin fastboot adb core/mkbootimg/mkbootimg
+ install -Dm 644 bash_completion.fastboot "$pkgdir"/usr/share/bash-completion/completions/fastboot
+ #adb completion is provided by bash-completion file now
+ #install -Dm 644 bash_completion.adb "$pkgdir"/usr/share/bash-completion/completions/adb
+}
Deleted: community-x86_64/bash_completion.adb
===================================================================
--- community-x86_64/bash_completion.adb 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-x86_64/bash_completion.adb 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,135 +0,0 @@
-## Bash completion for the Android SDK tools.
-##
-## Copyright (c) 2009 Matt Brubeck
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included in
-## all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-## THE SOFTWARE.
-
-
-function _adb()
-{
- local cur prev opts cmds c subcommand device_selected
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts="-d -e -s -p"
- cmds="devices push pull sync shell emu logcat forward jdwp install sideload \
- uninstall bugreport help version wait-for-device start-server \
- reboot reboot-bootloader \
- connect disconnect \
- kill-server get-state get-serialno status-window remount root ppp backup restore"
- cmds_not_need_device="devices help version start-server kill-server connect disconnect"
- subcommand=""
- device_selected=""
-
- # Look for the subcommand.
- c=1
- while [ $c -lt $COMP_CWORD ]; do
- word="${COMP_WORDS[c]}"
- if [ "$word" = "-d" -o "$word" = "-e" -o "$word" = "-s" ]; then
- device_selected=true
- opts="-p"
- fi
- for cmd in $cmds; do
- if [ "$cmd" = "$word" ]; then
- subcommand="$word"
- fi
- done
- c=$((++c))
- done
-
- case "${subcommand}" in
- '')
- case "${prev}" in
- -p)
- return 0;
- ;;
- -s)
- # Use 'adb devices' to list serial numbers.
- COMPREPLY=( $(compgen -W "$(adb devices |
- awk '/(device|recovery|sideload)$/{print $1}')" -- ${cur} ) )
- return 0
- ;;
- esac
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
- return 0
- ;;
- esac
- if [ -z "$device_selected" ]; then
- local num_devices=$(( $(adb devices 2>/dev/null|wc -l) - 2 ))
- if [ "$num_devices" -gt "1" ]; then
- # With multiple devices, you must choose a device first.
- COMPREPLY=( $(compgen -W "${opts} ${cmds_not_need_device}" -- ${cur}) )
- return 0
- fi
- fi
- COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
- return 0
- ;;
- install)
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "-l -r -s" -- ${cur}) )
- return 0
- ;;
- esac
- ;;
- forward)
- # Filename or installation option.
- COMPREPLY=( $(compgen -W "tcp: localabstract: localreserved: localfilesystem: dev: jdwp:" -- ${cur}) )
- return 0
- ;;
- uninstall)
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "-k" -- ${cur}) )
- return 0
- ;;
- esac
- ;;
- logcat)
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "-v -b -c -d -f -g -n -r -s" -- ${cur}) )
- return 0
- ;;
- esac
- case "${prev}" in
- -v)
- COMPREPLY=( $(compgen -W "brief process tag thread raw time long" -- ${cur}) )
- return 0
- ;;
- -b)
- COMPREPLY=( $(compgen -W "radio events main" -- ${cur}) )
- return 0
- ;;
- esac
- ;;
- backup)
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "-f -apk -noapk -obb -noobb -shared -noshared -all -system -nosystem" -- ${cur}) )
- return 0
- ;;
- esac
- ;;
- esac
-}
-complete -o default -F _adb adb
Copied: android-tools/repos/community-x86_64/bash_completion.adb (from rev 245524, android-tools/trunk/bash_completion.adb)
===================================================================
--- community-x86_64/bash_completion.adb (rev 0)
+++ community-x86_64/bash_completion.adb 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,135 @@
+## Bash completion for the Android SDK tools.
+##
+## Copyright (c) 2009 Matt Brubeck
+##
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+## THE SOFTWARE.
+
+
+function _adb()
+{
+ local cur prev opts cmds c subcommand device_selected
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+ opts="-d -e -s -p"
+ cmds="devices push pull sync shell emu logcat forward jdwp install sideload \
+ uninstall bugreport help version wait-for-device start-server \
+ reboot reboot-bootloader \
+ connect disconnect \
+ kill-server get-state get-serialno status-window remount root ppp backup restore"
+ cmds_not_need_device="devices help version start-server kill-server connect disconnect"
+ subcommand=""
+ device_selected=""
+
+ # Look for the subcommand.
+ c=1
+ while [ $c -lt $COMP_CWORD ]; do
+ word="${COMP_WORDS[c]}"
+ if [ "$word" = "-d" -o "$word" = "-e" -o "$word" = "-s" ]; then
+ device_selected=true
+ opts="-p"
+ fi
+ for cmd in $cmds; do
+ if [ "$cmd" = "$word" ]; then
+ subcommand="$word"
+ fi
+ done
+ c=$((++c))
+ done
+
+ case "${subcommand}" in
+ '')
+ case "${prev}" in
+ -p)
+ return 0;
+ ;;
+ -s)
+ # Use 'adb devices' to list serial numbers.
+ COMPREPLY=( $(compgen -W "$(adb devices |
+ awk '/(device|recovery|sideload)$/{print $1}')" -- ${cur} ) )
+ return 0
+ ;;
+ esac
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ if [ -z "$device_selected" ]; then
+ local num_devices=$(( $(adb devices 2>/dev/null|wc -l) - 2 ))
+ if [ "$num_devices" -gt "1" ]; then
+ # With multiple devices, you must choose a device first.
+ COMPREPLY=( $(compgen -W "${opts} ${cmds_not_need_device}" -- ${cur}) )
+ return 0
+ fi
+ fi
+ COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
+ return 0
+ ;;
+ install)
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "-l -r -s" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ ;;
+ forward)
+ # Filename or installation option.
+ COMPREPLY=( $(compgen -W "tcp: localabstract: localreserved: localfilesystem: dev: jdwp:" -- ${cur}) )
+ return 0
+ ;;
+ uninstall)
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "-k" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ ;;
+ logcat)
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "-v -b -c -d -f -g -n -r -s" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ case "${prev}" in
+ -v)
+ COMPREPLY=( $(compgen -W "brief process tag thread raw time long" -- ${cur}) )
+ return 0
+ ;;
+ -b)
+ COMPREPLY=( $(compgen -W "radio events main" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ ;;
+ backup)
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "-f -apk -noapk -obb -noobb -shared -noshared -all -system -nosystem" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ ;;
+ esac
+}
+complete -o default -F _adb adb
Deleted: community-x86_64/bash_completion.fastboot
===================================================================
--- community-x86_64/bash_completion.fastboot 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-x86_64/bash_completion.fastboot 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,90 +0,0 @@
-## Bash completion for the Android SDK tools.
-##
-## Copyright (c) 2009 Matt Brubeck
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included in
-## all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-## THE SOFTWARE.
-
-
-function _fastboot()
-{
- local cur prev opts cmds c subcommand device_selected
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts="-w -s -p -c -i -b -n"
- cmds="update flashall flash erase getvar boot devices \
- reboot reboot-bootloader oem continue"
- subcommand=""
- partition_list="boot recovery system userdata bootloader radio"
- device_selected=""
-
- # Look for the subcommand.
- c=1
- while [ $c -lt $COMP_CWORD ]; do
- word="${COMP_WORDS[c]}"
- if [ "$word" = "-s" ]; then
- device_selected=true
- fi
- for cmd in $cmds; do
- if [ "$cmd" = "$word" ]; then
- subcommand="$word"
- fi
- done
- c=$((++c))
- done
-
- case "${subcommand}" in
- '')
- case "${prev}" in
- -s)
- # Use 'fastboot devices' to list serial numbers.
- COMPREPLY=( $(compgen -W "$(fastboot devices|cut -f1)" -- ${cur} ) )
- return 0
- ;;
- esac
- case "${cur}" in
- -*)
- COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
- return 0
- ;;
- esac
- if [ -z "$device_selected" ]; then
- local num_devices=$(( $(fastboot devices 2>/dev/null|wc -l) ))
- if [ "$num_devices" -gt "1" ]; then
- # With multiple devices, you must choose a device first.
- COMPREPLY=( $(compgen -W "-s" -- ${cur}) )
- return 0
- fi
- fi
- COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
- return 0
- ;;
- flash)
- # partition name
- COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
- return 0
- ;;
- erase)
- # partition name
- COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
- return 0
- ;;
- esac
-}
-complete -o default -F _fastboot fastboot
Copied: android-tools/repos/community-x86_64/bash_completion.fastboot (from rev 245524, android-tools/trunk/bash_completion.fastboot)
===================================================================
--- community-x86_64/bash_completion.fastboot (rev 0)
+++ community-x86_64/bash_completion.fastboot 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,90 @@
+## Bash completion for the Android SDK tools.
+##
+## Copyright (c) 2009 Matt Brubeck
+##
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+## THE SOFTWARE.
+
+
+function _fastboot()
+{
+ local cur prev opts cmds c subcommand device_selected
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ prev="${COMP_WORDS[COMP_CWORD-1]}"
+ opts="-w -s -p -c -i -b -n"
+ cmds="update flashall flash erase getvar boot devices \
+ reboot reboot-bootloader oem continue"
+ subcommand=""
+ partition_list="boot recovery system userdata bootloader radio"
+ device_selected=""
+
+ # Look for the subcommand.
+ c=1
+ while [ $c -lt $COMP_CWORD ]; do
+ word="${COMP_WORDS[c]}"
+ if [ "$word" = "-s" ]; then
+ device_selected=true
+ fi
+ for cmd in $cmds; do
+ if [ "$cmd" = "$word" ]; then
+ subcommand="$word"
+ fi
+ done
+ c=$((++c))
+ done
+
+ case "${subcommand}" in
+ '')
+ case "${prev}" in
+ -s)
+ # Use 'fastboot devices' to list serial numbers.
+ COMPREPLY=( $(compgen -W "$(fastboot devices|cut -f1)" -- ${cur} ) )
+ return 0
+ ;;
+ esac
+ case "${cur}" in
+ -*)
+ COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
+ return 0
+ ;;
+ esac
+ if [ -z "$device_selected" ]; then
+ local num_devices=$(( $(fastboot devices 2>/dev/null|wc -l) ))
+ if [ "$num_devices" -gt "1" ]; then
+ # With multiple devices, you must choose a device first.
+ COMPREPLY=( $(compgen -W "-s" -- ${cur}) )
+ return 0
+ fi
+ fi
+ COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) )
+ return 0
+ ;;
+ flash)
+ # partition name
+ COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
+ return 0
+ ;;
+ erase)
+ # partition name
+ COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) )
+ return 0
+ ;;
+ esac
+}
+complete -o default -F _fastboot fastboot
Deleted: community-x86_64/build.sh
===================================================================
--- community-x86_64/build.sh 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-x86_64/build.sh 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,90 +0,0 @@
-# This set of commands generated by generate_build.rb script
-
-clang++ -o core/adb/adb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb.cpp
-clang++ -o core/adb/adb_auth.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_auth.cpp
-clang++ -o core/adb/adb_io.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_io.cpp
-clang++ -o core/adb/adb_listeners.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_listeners.cpp
-clang++ -o core/adb/adb_trace.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_trace.cpp
-clang++ -o core/adb/adb_utils.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_utils.cpp
-clang++ -o core/adb/bugreport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/bugreport.cpp
-clang++ -o core/adb/line_printer.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/line_printer.cpp
-clang++ -o core/adb/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/sockets.cpp
-clang++ -o core/adb/transport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport.cpp
-clang++ -o core/adb/transport_local.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport_local.cpp
-clang++ -o core/adb/transport_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport_usb.cpp
-clang++ -o core/adb/sysdeps_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/sysdeps_unix.cpp
-clang++ -o core/adb/fdevent.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/fdevent.cpp
-clang++ -o core/adb/get_my_path_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/get_my_path_linux.cpp
-clang++ -o core/adb/usb_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/usb_linux.cpp
-clang++ -o core/adb/adb_auth_host.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_auth_host.cpp
-clang++ -o core/adb/shell_service_protocol.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/shell_service_protocol.cpp
-clang++ -o core/adb/console.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/console.cpp
-clang++ -o core/adb/commandline.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/commandline.cpp
-clang++ -o core/adb/adb_client.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_client.cpp
-clang++ -o core/adb/services.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/services.cpp
-clang++ -o core/adb/file_sync_client.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/file_sync_client.cpp
-clang++ -o core/adb/client/main.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/client/main.cpp
-clang++ -o core/base/file.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/file.cpp
-clang++ -o core/base/logging.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/logging.cpp
-clang++ -o core/base/parsenetaddress.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/parsenetaddress.cpp
-clang++ -o core/base/stringprintf.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/stringprintf.cpp
-clang++ -o core/base/strings.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/strings.cpp
-clang++ -o core/base/errors_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/errors_unix.cpp
-clang -o core/liblog/log_event_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/log_event_write.c
-clang -o core/liblog/fake_log_device.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/fake_log_device.c
-clang -o core/liblog/log_event_list.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/log_event_list.c
-clang -o core/liblog/logger_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_write.c
-clang -o core/liblog/config_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/config_write.c
-clang -o core/liblog/logger_lock.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_lock.c
-clang -o core/liblog/fake_writer.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/fake_writer.c
-clang -o core/liblog/logger_name.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_name.c
-clang -o core/libcutils/load_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/load_file.c
-clang -o core/libcutils/socket_local_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_local_client_unix.c
-clang -o core/libcutils/socket_loopback_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_client_unix.c
-clang -o core/libcutils/socket_network_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_network_client_unix.c
-clang -o core/libcutils/socket_loopback_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_server_unix.c
-clang -o core/libcutils/socket_local_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_local_server_unix.c
-clang++ -o core/libcutils/sockets_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/sockets_unix.cpp
-clang -o core/libcutils/socket_inaddr_any_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_inaddr_any_server_unix.c
-clang++ -o core/libcutils/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/sockets.cpp
-clang++ -o core/adb/diagnose_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/include -Icore/base/include -c core/adb/diagnose_usb.cpp
-g++ -o adb -lpthread -lcrypto $LDFLAGS core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/libcutils/load_file.c.o core/libcutils/socket_local_client_unix.c.o core/libcutils/socket_loopback_client_unix.c.o core/libcutils/socket_network_client_unix.c.o core/libcutils/socket_loopback_server_unix.c.o core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o core/adb/adb.cpp.o core/adb/adb_auth.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o core/adb/bugreport.cpp.o core/adb/line_printer.cpp
.o core/adb/sockets.cpp.o core/adb/transport.cpp.o core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o core/adb/sysdeps_unix.cpp.o core/adb/fdevent.cpp.o core/adb/get_my_path_linux.cpp.o core/adb/usb_linux.cpp.o core/adb/adb_auth_host.cpp.o core/adb/shell_service_protocol.cpp.o core/adb/console.cpp.o core/adb/commandline.cpp.o core/adb/adb_client.cpp.o core/adb/services.cpp.o core/adb/file_sync_client.cpp.o core/adb/client/main.cpp.o core/adb/diagnose_usb.cpp.o
-clang++ -o core/fastboot/protocol.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/protocol.cpp
-clang++ -o core/fastboot/engine.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/engine.cpp
-clang++ -o core/fastboot/bootimg_utils.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/bootimg_utils.cpp
-clang++ -o core/fastboot/fastboot.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/fastboot.cpp
-clang++ -o core/fastboot/util.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/util.cpp
-clang++ -o core/fastboot/fs.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/fs.cpp
-clang++ -o core/fastboot/usb_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/usb_linux.cpp
-clang++ -o core/fastboot/util_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/util_linux.cpp
-clang++ -o core/fastboot/socket.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/socket.cpp
-clang++ -o core/fastboot/tcp.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/tcp.cpp
-clang++ -o core/fastboot/udp.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/udp.cpp
-clang -o core/libsparse/backed_block.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/backed_block.c
-clang -o core/libsparse/output_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/output_file.c
-clang -o core/libsparse/sparse.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse.c
-clang -o core/libsparse/sparse_crc32.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_crc32.c
-clang -o core/libsparse/sparse_err.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_err.c
-clang -o core/libsparse/sparse_read.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_read.c
-clang++ -o core/libziparchive/zip_archive.cc.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/base/include -Icore/include -c core/libziparchive/zip_archive.cc
-clang++ -o core/libutils/FileMap.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/include -c core/libutils/FileMap.cpp
-clang -o extras/ext4_utils/make_ext4fs.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/make_ext4fs.c
-clang -o extras/ext4_utils/ext4fixup.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4fixup.c
-clang -o extras/ext4_utils/ext4_utils.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4_utils.c
-clang -o extras/ext4_utils/allocate.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/allocate.c
-clang -o extras/ext4_utils/contents.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/contents.c
-clang -o extras/ext4_utils/extent.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/extent.c
-clang -o extras/ext4_utils/indirect.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/indirect.c
-clang -o extras/ext4_utils/sha1.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/sha1.c
-clang -o extras/ext4_utils/wipe.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/wipe.c
-clang -o extras/ext4_utils/crc16.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/crc16.c
-clang -o extras/ext4_utils/ext4_sb.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4_sb.c
-clang -o libselinux/src/callbacks.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/callbacks.c
-clang -o libselinux/src/check_context.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/check_context.c
-clang -o libselinux/src/freecon.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/freecon.c
-clang -o libselinux/src/init.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/init.c
-clang -o libselinux/src/label.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label.c
-clang -o libselinux/src/label_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_file.c
-clang -o libselinux/src/label_android_property.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_android_property.c
-clang -o libselinux/src/label_support.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_support.c
-g++ -o fastboot -lz -lpcre -lpthread $LDFLAGS core/libsparse/backed_block.c.o core/libsparse/output_file.c.o core/libsparse/sparse.c.o core/libsparse/sparse_crc32.c.o core/libsparse/sparse_err.c.o core/libsparse/sparse_read.c.o core/libziparchive/zip_archive.cc.o core/libcutils/load_file.c.o core/libcutils/socket_local_client_unix.c.o core/libcutils/socket_loopback_client_unix.c.o core/libcutils/socket_network_client_unix.c.o core/libcutils/socket_loopback_server_unix.c.o core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/libutils/FileMap.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf
.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o extras/ext4_utils/make_ext4fs.c.o extras/ext4_utils/ext4fixup.c.o extras/ext4_utils/ext4_utils.c.o extras/ext4_utils/allocate.c.o extras/ext4_utils/contents.c.o extras/ext4_utils/extent.c.o extras/ext4_utils/indirect.c.o extras/ext4_utils/sha1.c.o extras/ext4_utils/wipe.c.o extras/ext4_utils/crc16.c.o extras/ext4_utils/ext4_sb.c.o libselinux/src/callbacks.c.o libselinux/src/check_context.c.o libselinux/src/freecon.c.o libselinux/src/init.c.o libselinux/src/label.c.o libselinux/src/label_file.c.o libselinux/src/label_android_property.c.o libselinux/src/label_support.c.o core/fastboot/protocol.cpp.o core/fastboot/engine.cpp.o core/fastboot/bootimg_utils.cpp.o core/fastboot/fastboot.cpp.o core/fastboot/util.cpp.o core/fastboot/fs.cpp.o core/fastboot/usb_linux.cpp.o core/fastboot/util_linux.cpp.o core/fastboot/socket.cpp.o core/fastboot/tcp.cpp.o core/fastboot/udp.cpp.o core/adb/diagnose_usb.cpp.o
Copied: android-tools/repos/community-x86_64/build.sh (from rev 245524, android-tools/trunk/build.sh)
===================================================================
--- community-x86_64/build.sh (rev 0)
+++ community-x86_64/build.sh 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,90 @@
+# This set of commands generated by generate_build.rb script
+
+clang++ -o core/adb/adb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb.cpp
+clang++ -o core/adb/adb_auth.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_auth.cpp
+clang++ -o core/adb/adb_io.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_io.cpp
+clang++ -o core/adb/adb_listeners.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_listeners.cpp
+clang++ -o core/adb/adb_trace.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_trace.cpp
+clang++ -o core/adb/adb_utils.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_utils.cpp
+clang++ -o core/adb/bugreport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/bugreport.cpp
+clang++ -o core/adb/line_printer.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/line_printer.cpp
+clang++ -o core/adb/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/sockets.cpp
+clang++ -o core/adb/transport.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport.cpp
+clang++ -o core/adb/transport_local.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport_local.cpp
+clang++ -o core/adb/transport_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/transport_usb.cpp
+clang++ -o core/adb/sysdeps_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/sysdeps_unix.cpp
+clang++ -o core/adb/fdevent.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/fdevent.cpp
+clang++ -o core/adb/get_my_path_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/get_my_path_linux.cpp
+clang++ -o core/adb/usb_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/usb_linux.cpp
+clang++ -o core/adb/adb_auth_host.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_auth_host.cpp
+clang++ -o core/adb/shell_service_protocol.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/shell_service_protocol.cpp
+clang++ -o core/adb/console.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/console.cpp
+clang++ -o core/adb/commandline.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/commandline.cpp
+clang++ -o core/adb/adb_client.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/adb_client.cpp
+clang++ -o core/adb/services.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/services.cpp
+clang++ -o core/adb/file_sync_client.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/file_sync_client.cpp
+clang++ -o core/adb/client/main.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb -c core/adb/client/main.cpp
+clang++ -o core/base/file.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/file.cpp
+clang++ -o core/base/logging.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/logging.cpp
+clang++ -o core/base/parsenetaddress.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/parsenetaddress.cpp
+clang++ -o core/base/stringprintf.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/stringprintf.cpp
+clang++ -o core/base/strings.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/strings.cpp
+clang++ -o core/base/errors_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DADB_HOST=1 -Icore/base/include -Icore/include -c core/base/errors_unix.cpp
+clang -o core/liblog/log_event_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/log_event_write.c
+clang -o core/liblog/fake_log_device.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/fake_log_device.c
+clang -o core/liblog/log_event_list.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/log_event_list.c
+clang -o core/liblog/logger_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_write.c
+clang -o core/liblog/config_write.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/config_write.c
+clang -o core/liblog/logger_lock.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_lock.c
+clang -o core/liblog/fake_writer.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/fake_writer.c
+clang -o core/liblog/logger_name.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include -c core/liblog/logger_name.c
+clang -o core/libcutils/load_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/load_file.c
+clang -o core/libcutils/socket_local_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_local_client_unix.c
+clang -o core/libcutils/socket_loopback_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_client_unix.c
+clang -o core/libcutils/socket_network_client_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_network_client_unix.c
+clang -o core/libcutils/socket_loopback_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_loopback_server_unix.c
+clang -o core/libcutils/socket_local_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_local_server_unix.c
+clang++ -o core/libcutils/sockets_unix.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/sockets_unix.cpp
+clang -o core/libcutils/socket_inaddr_any_server_unix.c.o -std=gnu11 $CFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/socket_inaddr_any_server_unix.c
+clang++ -o core/libcutils/sockets.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -D_GNU_SOURCE -Icore/include -c core/libcutils/sockets.cpp
+clang++ -o core/adb/diagnose_usb.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/include -Icore/base/include -c core/adb/diagnose_usb.cpp
+clang++ -o adb -lpthread -lcrypto $LDFLAGS core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringprintf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/libcutils/load_file.c.o core/libcutils/socket_local_client_unix.c.o core/libcutils/socket_loopback_client_unix.c.o core/libcutils/socket_network_client_unix.c.o core/libcutils/socket_loopback_server_unix.c.o core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o core/adb/adb.cpp.o core/adb/adb_auth.cpp.o core/adb/adb_io.cpp.o core/adb/adb_listeners.cpp.o core/adb/adb_trace.cpp.o core/adb/adb_utils.cpp.o core/adb/bugreport.cpp.o core/adb/line_printer
.cpp.o core/adb/sockets.cpp.o core/adb/transport.cpp.o core/adb/transport_local.cpp.o core/adb/transport_usb.cpp.o core/adb/sysdeps_unix.cpp.o core/adb/fdevent.cpp.o core/adb/get_my_path_linux.cpp.o core/adb/usb_linux.cpp.o core/adb/adb_auth_host.cpp.o core/adb/shell_service_protocol.cpp.o core/adb/console.cpp.o core/adb/commandline.cpp.o core/adb/adb_client.cpp.o core/adb/services.cpp.o core/adb/file_sync_client.cpp.o core/adb/client/main.cpp.o core/adb/diagnose_usb.cpp.o
+clang++ -o core/fastboot/protocol.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/protocol.cpp
+clang++ -o core/fastboot/engine.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/engine.cpp
+clang++ -o core/fastboot/bootimg_utils.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/bootimg_utils.cpp
+clang++ -o core/fastboot/fastboot.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/fastboot.cpp
+clang++ -o core/fastboot/util.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/util.cpp
+clang++ -o core/fastboot/fs.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/fs.cpp
+clang++ -o core/fastboot/usb_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/usb_linux.cpp
+clang++ -o core/fastboot/util_linux.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/util_linux.cpp
+clang++ -o core/fastboot/socket.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/socket.cpp
+clang++ -o core/fastboot/tcp.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/tcp.cpp
+clang++ -o core/fastboot/udp.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils -c core/fastboot/udp.cpp
+clang -o core/libsparse/backed_block.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/backed_block.c
+clang -o core/libsparse/output_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/output_file.c
+clang -o core/libsparse/sparse.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse.c
+clang -o core/libsparse/sparse_crc32.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_crc32.c
+clang -o core/libsparse/sparse_err.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_err.c
+clang -o core/libsparse/sparse_read.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -c core/libsparse/sparse_read.c
+clang++ -o core/libziparchive/zip_archive.cc.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/base/include -Icore/include -c core/libziparchive/zip_archive.cc
+clang++ -o core/libutils/FileMap.cpp.o -std=gnu++14 $CXXFLAGS $CPPFLAGS -Icore/include -c core/libutils/FileMap.cpp
+clang -o extras/ext4_utils/make_ext4fs.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/make_ext4fs.c
+clang -o extras/ext4_utils/ext4fixup.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4fixup.c
+clang -o extras/ext4_utils/ext4_utils.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4_utils.c
+clang -o extras/ext4_utils/allocate.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/allocate.c
+clang -o extras/ext4_utils/contents.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/contents.c
+clang -o extras/ext4_utils/extent.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/extent.c
+clang -o extras/ext4_utils/indirect.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/indirect.c
+clang -o extras/ext4_utils/sha1.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/sha1.c
+clang -o extras/ext4_utils/wipe.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/wipe.c
+clang -o extras/ext4_utils/crc16.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/crc16.c
+clang -o extras/ext4_utils/ext4_sb.c.o -std=gnu11 $CFLAGS $CPPFLAGS -Icore/libsparse/include -Icore/include -Ilibselinux/include -c extras/ext4_utils/ext4_sb.c
+clang -o libselinux/src/callbacks.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/callbacks.c
+clang -o libselinux/src/check_context.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/check_context.c
+clang -o libselinux/src/freecon.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/freecon.c
+clang -o libselinux/src/init.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/init.c
+clang -o libselinux/src/label.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label.c
+clang -o libselinux/src/label_file.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_file.c
+clang -o libselinux/src/label_android_property.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_android_property.c
+clang -o libselinux/src/label_support.c.o -std=gnu11 $CFLAGS $CPPFLAGS -DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include -c libselinux/src/label_support.c
+clang++ -o fastboot -lz -lpcre -lpthread $LDFLAGS core/libsparse/backed_block.c.o core/libsparse/output_file.c.o core/libsparse/sparse.c.o core/libsparse/sparse_crc32.c.o core/libsparse/sparse_err.c.o core/libsparse/sparse_read.c.o core/libziparchive/zip_archive.cc.o core/libcutils/load_file.c.o core/libcutils/socket_local_client_unix.c.o core/libcutils/socket_loopback_client_unix.c.o core/libcutils/socket_network_client_unix.c.o core/libcutils/socket_loopback_server_unix.c.o core/libcutils/socket_local_server_unix.c.o core/libcutils/sockets_unix.cpp.o core/libcutils/socket_inaddr_any_server_unix.c.o core/libcutils/sockets.cpp.o core/liblog/log_event_write.c.o core/liblog/fake_log_device.c.o core/liblog/log_event_list.c.o core/liblog/logger_write.c.o core/liblog/config_write.c.o core/liblog/logger_lock.c.o core/liblog/fake_writer.c.o core/liblog/logger_name.c.o core/libutils/FileMap.cpp.o core/base/file.cpp.o core/base/logging.cpp.o core/base/parsenetaddress.cpp.o core/base/stringpr
intf.cpp.o core/base/strings.cpp.o core/base/errors_unix.cpp.o extras/ext4_utils/make_ext4fs.c.o extras/ext4_utils/ext4fixup.c.o extras/ext4_utils/ext4_utils.c.o extras/ext4_utils/allocate.c.o extras/ext4_utils/contents.c.o extras/ext4_utils/extent.c.o extras/ext4_utils/indirect.c.o extras/ext4_utils/sha1.c.o extras/ext4_utils/wipe.c.o extras/ext4_utils/crc16.c.o extras/ext4_utils/ext4_sb.c.o libselinux/src/callbacks.c.o libselinux/src/check_context.c.o libselinux/src/freecon.c.o libselinux/src/init.c.o libselinux/src/label.c.o libselinux/src/label_file.c.o libselinux/src/label_android_property.c.o libselinux/src/label_support.c.o core/fastboot/protocol.cpp.o core/fastboot/engine.cpp.o core/fastboot/bootimg_utils.cpp.o core/fastboot/fastboot.cpp.o core/fastboot/util.cpp.o core/fastboot/fs.cpp.o core/fastboot/usb_linux.cpp.o core/fastboot/util_linux.cpp.o core/fastboot/socket.cpp.o core/fastboot/tcp.cpp.o core/fastboot/udp.cpp.o core/adb/diagnose_usb.cpp.o
Deleted: community-x86_64/fix_build.patch
===================================================================
--- community-x86_64/fix_build.patch 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-x86_64/fix_build.patch 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,66 +0,0 @@
-diff --git a/core/adb/sysdeps.h b/core/adb/sysdeps.h
-index 75dcc86..867f3ec 100644
---- a/core/adb/sysdeps.h
-+++ b/core/adb/sysdeps.h
-@@ -25,6 +25,7 @@
- #endif
-
- #include <errno.h>
-+#include <sys/syscall.h>
-
- #include <string>
- #include <vector>
-@@ -831,7 +832,16 @@ static __inline__ int adb_is_absolute_host_path(const char* path) {
-
- static __inline__ unsigned long adb_thread_id()
- {
-- return (unsigned long)gettid();
-+ // TODO: this function should be merged with GetThreadId
-+#if defined(__BIONIC__)
-+ return gettid();
-+#elif defined(__APPLE__)
-+ return syscall(SYS_thread_selfid);
-+#elif defined(__linux__)
-+ return syscall(__NR_gettid);
-+#elif defined(_WIN32)
-+ return GetCurrentThreadId();
-+#endif
- }
-
- #endif /* !_WIN32 */
-diff --git a/core/base/errors_unix.cpp b/core/base/errors_unix.cpp
-index 296995e..48269b6 100644
---- a/core/base/errors_unix.cpp
-+++ b/core/base/errors_unix.cpp
-@@ -17,6 +17,7 @@
- #include "android-base/errors.h"
-
- #include <errno.h>
-+#include <string.h>
-
- namespace android {
- namespace base {
-diff --git a/core/base/file.cpp b/core/base/file.cpp
-index da1adba..91a3901 100644
---- a/core/base/file.cpp
-+++ b/core/base/file.cpp
-@@ -20,6 +20,7 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <string.h>
-
- #include <string>
-
-diff --git a/core/base/logging.cpp b/core/base/logging.cpp
-index 1741871..e97c7f1 100644
---- a/core/base/logging.cpp
-+++ b/core/base/logging.cpp
-@@ -21,6 +21,7 @@
- #include "android-base/logging.h"
-
- #include <libgen.h>
-+#include <string.h>
-
- // For getprogname(3) or program_invocation_short_name.
- #if defined(__ANDROID__) || defined(__APPLE__)
Copied: android-tools/repos/community-x86_64/fix_build.patch (from rev 245524, android-tools/trunk/fix_build.patch)
===================================================================
--- community-x86_64/fix_build.patch (rev 0)
+++ community-x86_64/fix_build.patch 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,66 @@
+diff --git a/core/adb/sysdeps.h b/core/adb/sysdeps.h
+index 75dcc86..867f3ec 100644
+--- a/core/adb/sysdeps.h
++++ b/core/adb/sysdeps.h
+@@ -25,6 +25,7 @@
+ #endif
+
+ #include <errno.h>
++#include <sys/syscall.h>
+
+ #include <string>
+ #include <vector>
+@@ -831,7 +832,16 @@ static __inline__ int adb_is_absolute_host_path(const char* path) {
+
+ static __inline__ unsigned long adb_thread_id()
+ {
+- return (unsigned long)gettid();
++ // TODO: this function should be merged with GetThreadId
++#if defined(__BIONIC__)
++ return gettid();
++#elif defined(__APPLE__)
++ return syscall(SYS_thread_selfid);
++#elif defined(__linux__)
++ return syscall(__NR_gettid);
++#elif defined(_WIN32)
++ return GetCurrentThreadId();
++#endif
+ }
+
+ #endif /* !_WIN32 */
+diff --git a/core/base/errors_unix.cpp b/core/base/errors_unix.cpp
+index 296995e..48269b6 100644
+--- a/core/base/errors_unix.cpp
++++ b/core/base/errors_unix.cpp
+@@ -17,6 +17,7 @@
+ #include "android-base/errors.h"
+
+ #include <errno.h>
++#include <string.h>
+
+ namespace android {
+ namespace base {
+diff --git a/core/base/file.cpp b/core/base/file.cpp
+index da1adba..91a3901 100644
+--- a/core/base/file.cpp
++++ b/core/base/file.cpp
+@@ -20,6 +20,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <string.h>
+
+ #include <string>
+
+diff --git a/core/base/logging.cpp b/core/base/logging.cpp
+index 1741871..e97c7f1 100644
+--- a/core/base/logging.cpp
++++ b/core/base/logging.cpp
+@@ -21,6 +21,7 @@
+ #include "android-base/logging.h"
+
+ #include <libgen.h>
++#include <string.h>
+
+ // For getprogname(3) or program_invocation_short_name.
+ #if defined(__ANDROID__) || defined(__APPLE__)
Deleted: community-x86_64/generate_build.rb
===================================================================
--- community-x86_64/generate_build.rb 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-x86_64/generate_build.rb 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,183 +0,0 @@
-#!/usr/bin/ruby
-
-# Android build system is complicated and does not allow to build
-# separate parts easily.
-# This script tries to mimic Android build rules.
-
-def expand(dir, files)
- files.map{|f| File.join(dir,f)}
-end
-
-# Compiles sources to *.o files.
-# Returns array of output *.o filenames
-def compile(sources, cflags)
- outputs = []
- for s in sources
- ext = File.extname(s)
-
- case ext
- when '.c'
- cc = 'clang'
- lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
- when '.cpp', '.cc'
- cc = 'clang++'
- lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
- else
- raise "Unknown extension #{ext}"
- end
-
- output = s + '.o'
- outputs << output
- puts "#{cc} -o #{output} #{lang_flags} #{cflags} -c #{s}\n"
- end
-
- return outputs
-end
-
-# Links object files
-def link(output, objects, ldflags)
- puts "g++ -o #{output} #{ldflags} $LDFLAGS #{objects.join(' ')}"
-end
-
-puts "# This set of commands generated by generate_build.rb script\n\n"
-
-adbdfiles = %w(
- adb.cpp
- adb_auth.cpp
- adb_io.cpp
- adb_listeners.cpp
- adb_trace.cpp
- adb_utils.cpp
- bugreport.cpp
- line_printer.cpp
- sockets.cpp
- transport.cpp
- transport_local.cpp
- transport_usb.cpp
- sysdeps_unix.cpp
-
- fdevent.cpp
- get_my_path_linux.cpp
- usb_linux.cpp
-
- adb_auth_host.cpp
- shell_service_protocol.cpp
-)
-libadbd = compile(expand('core/adb', adbdfiles), '-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb')
-
-adbfiles = %w(
- console.cpp
- commandline.cpp
- adb_client.cpp
- services.cpp
- file_sync_client.cpp
- client/main.cpp
-)
-libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb')
-
-basefiles = %w(
- file.cpp
- logging.cpp
- parsenetaddress.cpp
- stringprintf.cpp
- strings.cpp
- errors_unix.cpp
-)
-libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include')
-
-logfiles = %w(
- log_event_write.c
- fake_log_device.c
- log_event_list.c
- logger_write.c
- config_write.c
- logger_lock.c
- fake_writer.c
- logger_name.c
-)
-liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include')
-
-cutilsfiles = %w(
- load_file.c
- socket_local_client_unix.c
- socket_loopback_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
- sockets.cpp
-)
-libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/include')
-
-diagnoseusbfiles = %w(
- diagnose_usb.cpp
-)
-libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include')
-
-link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb, '-lpthread -lcrypto')
-
-
-fastbootfiles = %w(
- protocol.cpp
- engine.cpp
- bootimg_utils.cpp
- fastboot.cpp
- util.cpp
- fs.cpp
- usb_linux.cpp
- util_linux.cpp
- socket.cpp
- tcp.cpp
- udp.cpp
-)
-libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils')
-
-sparsefiles = %w(
- backed_block.c
- output_file.c
- sparse.c
- sparse_crc32.c
- sparse_err.c
- sparse_read.c
-)
-libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include')
-
-zipfiles = %w(
- zip_archive.cc
-)
-libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include')
-
-utilfiles = %w(
- FileMap.cpp
-)
-libutil = compile(expand('core/libutils', utilfiles), '-Icore/include')
-
-ext4files = %w(
- make_ext4fs.c
- ext4fixup.c
- ext4_utils.c
- allocate.c
- contents.c
- extent.c
- indirect.c
- sha1.c
- wipe.c
- crc16.c
- ext4_sb.c
-)
-libext4 = compile(expand('extras/ext4_utils', ext4files), '-Icore/libsparse/include -Icore/include -Ilibselinux/include')
-
-selinuxfiles = %w(
- src/callbacks.c
- src/check_context.c
- src/freecon.c
- src/init.c
- src/label.c
- src/label_file.c
- src/label_android_property.c
- src/label_support.c
-)
-libselinux = compile(expand('libselinux', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include')
-
-link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + libselinux + libfastboot + libdiagnoseusb, '-lz -lpcre -lpthread')
Copied: android-tools/repos/community-x86_64/generate_build.rb (from rev 245524, android-tools/trunk/generate_build.rb)
===================================================================
--- community-x86_64/generate_build.rb (rev 0)
+++ community-x86_64/generate_build.rb 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,183 @@
+#!/usr/bin/ruby
+
+# Android build system is complicated and does not allow to build
+# separate parts easily.
+# This script tries to mimic Android build rules.
+
+def expand(dir, files)
+ files.map{|f| File.join(dir,f)}
+end
+
+# Compiles sources to *.o files.
+# Returns array of output *.o filenames
+def compile(sources, cflags)
+ outputs = []
+ for s in sources
+ ext = File.extname(s)
+
+ case ext
+ when '.c'
+ cc = 'clang'
+ lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
+ when '.cpp', '.cc'
+ cc = 'clang++'
+ lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS'
+ else
+ raise "Unknown extension #{ext}"
+ end
+
+ output = s + '.o'
+ outputs << output
+ puts "#{cc} -o #{output} #{lang_flags} #{cflags} -c #{s}\n"
+ end
+
+ return outputs
+end
+
+# Links object files
+def link(output, objects, ldflags)
+ puts "clang++ -o #{output} #{ldflags} $LDFLAGS #{objects.join(' ')}"
+end
+
+puts "# This set of commands generated by generate_build.rb script\n\n"
+
+adbdfiles = %w(
+ adb.cpp
+ adb_auth.cpp
+ adb_io.cpp
+ adb_listeners.cpp
+ adb_trace.cpp
+ adb_utils.cpp
+ bugreport.cpp
+ line_printer.cpp
+ sockets.cpp
+ transport.cpp
+ transport_local.cpp
+ transport_usb.cpp
+ sysdeps_unix.cpp
+
+ fdevent.cpp
+ get_my_path_linux.cpp
+ usb_linux.cpp
+
+ adb_auth_host.cpp
+ shell_service_protocol.cpp
+)
+libadbd = compile(expand('core/adb', adbdfiles), '-DADB_REVISION=\"$PKGVER\" -DADB_HOST=1 -fpermissive -Icore/include -Icore/base/include -Icore/adb')
+
+adbfiles = %w(
+ console.cpp
+ commandline.cpp
+ adb_client.cpp
+ services.cpp
+ file_sync_client.cpp
+ client/main.cpp
+)
+libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -DWORKAROUND_BUG6558362 -fpermissive -Icore/include -Icore/base/include -Icore/adb')
+
+basefiles = %w(
+ file.cpp
+ logging.cpp
+ parsenetaddress.cpp
+ stringprintf.cpp
+ strings.cpp
+ errors_unix.cpp
+)
+libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include')
+
+logfiles = %w(
+ log_event_write.c
+ fake_log_device.c
+ log_event_list.c
+ logger_write.c
+ config_write.c
+ logger_lock.c
+ fake_writer.c
+ logger_name.c
+)
+liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1005 -DFAKE_LOG_DEVICE=1 -D_GNU_SOURCE -Icore/log/include -Icore/include')
+
+cutilsfiles = %w(
+ load_file.c
+ socket_local_client_unix.c
+ socket_loopback_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
+ sockets.cpp
+)
+libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/include')
+
+diagnoseusbfiles = %w(
+ diagnose_usb.cpp
+)
+libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include')
+
+link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb, '-lpthread -lcrypto')
+
+
+fastbootfiles = %w(
+ protocol.cpp
+ engine.cpp
+ bootimg_utils.cpp
+ fastboot.cpp
+ util.cpp
+ fs.cpp
+ usb_linux.cpp
+ util_linux.cpp
+ socket.cpp
+ tcp.cpp
+ udp.cpp
+)
+libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils -Iextras/f2fs_utils')
+
+sparsefiles = %w(
+ backed_block.c
+ output_file.c
+ sparse.c
+ sparse_crc32.c
+ sparse_err.c
+ sparse_read.c
+)
+libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include')
+
+zipfiles = %w(
+ zip_archive.cc
+)
+libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include')
+
+utilfiles = %w(
+ FileMap.cpp
+)
+libutil = compile(expand('core/libutils', utilfiles), '-Icore/include')
+
+ext4files = %w(
+ make_ext4fs.c
+ ext4fixup.c
+ ext4_utils.c
+ allocate.c
+ contents.c
+ extent.c
+ indirect.c
+ sha1.c
+ wipe.c
+ crc16.c
+ ext4_sb.c
+)
+libext4 = compile(expand('extras/ext4_utils', ext4files), '-Icore/libsparse/include -Icore/include -Ilibselinux/include')
+
+selinuxfiles = %w(
+ src/callbacks.c
+ src/check_context.c
+ src/freecon.c
+ src/init.c
+ src/label.c
+ src/label_file.c
+ src/label_android_property.c
+ src/label_support.c
+)
+libselinux = compile(expand('libselinux', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -Ilibselinux/include')
+
+link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + libselinux + libfastboot + libdiagnoseusb, '-lz -lpcre -lpthread')
Deleted: community-x86_64/openssl-1.1.0.patch
===================================================================
--- community-x86_64/openssl-1.1.0.patch 2017-07-17 23:50:08 UTC (rev 245524)
+++ community-x86_64/openssl-1.1.0.patch 2017-07-17 23:52:14 UTC (rev 245525)
@@ -1,32 +0,0 @@
-diff --git a/adb/adb_auth_host.cpp b/adb/adb_auth_host.cpp
-index 7b6671d73..d9fc00f86 100644
---- a/adb/adb_auth_host.cpp
-+++ b/adb/adb_auth_host.cpp
-@@ -71,6 +71,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
- BIGNUM* rem = BN_new();
- BIGNUM* n = BN_new();
- BIGNUM* n0inv = BN_new();
-+ const BIGNUM* rsa_n;
-+ const BIGNUM* rsa_e;
-
- if (RSA_size(rsa) != RSANUMBYTES) {
- ret = 0;
-@@ -78,7 +80,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
- }
-
- BN_set_bit(r32, 32);
-- BN_copy(n, rsa->n);
-+ RSA_get0_key (rsa, &rsa_n, &rsa_e, NULL);
-+ BN_copy(n, rsa_n);
- BN_set_bit(r, RSANUMWORDS * 32);
- BN_mod_sqr(rr, r, n, ctx);
- BN_div(NULL, rem, n, r32, ctx);
-@@ -92,7 +95,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
- BN_div(n, rem, n, r32, ctx);
- pkey->n[i] = BN_get_word(rem);
- }
-- pkey->exponent = BN_get_word(rsa->e);
-+ pkey->exponent = BN_get_word(rsa_e);
-
- out:
- BN_free(n0inv);
Copied: android-tools/repos/community-x86_64/openssl-1.1.0.patch (from rev 245524, android-tools/trunk/openssl-1.1.0.patch)
===================================================================
--- community-x86_64/openssl-1.1.0.patch (rev 0)
+++ community-x86_64/openssl-1.1.0.patch 2017-07-17 23:52:14 UTC (rev 245525)
@@ -0,0 +1,32 @@
+diff --git a/adb/adb_auth_host.cpp b/adb/adb_auth_host.cpp
+index 7b6671d73..d9fc00f86 100644
+--- a/adb/adb_auth_host.cpp
++++ b/adb/adb_auth_host.cpp
+@@ -71,6 +71,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+ BIGNUM* rem = BN_new();
+ BIGNUM* n = BN_new();
+ BIGNUM* n0inv = BN_new();
++ const BIGNUM* rsa_n;
++ const BIGNUM* rsa_e;
+
+ if (RSA_size(rsa) != RSANUMBYTES) {
+ ret = 0;
+@@ -78,7 +80,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+ }
+
+ BN_set_bit(r32, 32);
+- BN_copy(n, rsa->n);
++ RSA_get0_key (rsa, &rsa_n, &rsa_e, NULL);
++ BN_copy(n, rsa_n);
+ BN_set_bit(r, RSANUMWORDS * 32);
+ BN_mod_sqr(rr, r, n, ctx);
+ BN_div(NULL, rem, n, r32, ctx);
+@@ -92,7 +95,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+ BN_div(n, rem, n, r32, ctx);
+ pkey->n[i] = BN_get_word(rem);
+ }
+- pkey->exponent = BN_get_word(rsa->e);
++ pkey->exponent = BN_get_word(rsa_e);
+
+ out:
+ BN_free(n0inv);
More information about the arch-commits
mailing list