android-tools: fix armv6l* build and remove old ruby build script
This commit is contained in:
John
parent
21c1b77eed
commit
c5cc0d2487
2 changed files with 11 additions and 406 deletions
|
|
@ -1,405 +0,0 @@
|
|||
#!/usr/bin/ruby
|
||||
# This ruby script has been copied from Arch Linux.
|
||||
|
||||
# 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 = 'cc'
|
||||
lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
|
||||
when '.cpp', '.cc'
|
||||
cc = 'cxx'
|
||||
lang_flags = '-std=gnu++17 $CXXFLAGS $CPPFLAGS'
|
||||
else
|
||||
raise "Unknown extension #{ext}"
|
||||
end
|
||||
|
||||
output = s + '.o'
|
||||
outputs << output
|
||||
puts "build #{output}: #{cc} #{s}\n cflags = #{lang_flags} #{cflags}"
|
||||
end
|
||||
|
||||
return outputs
|
||||
end
|
||||
|
||||
# dir - directory where ninja file is located
|
||||
# lib - static library path relative to dir
|
||||
def subninja(dir, lib)
|
||||
puts "subninja #{dir}build.ninja"
|
||||
return lib.each{|l| dir + l}
|
||||
end
|
||||
|
||||
# Links object files
|
||||
def link(output, objects, ldflags)
|
||||
puts "build #{output}: link #{objects.join(' ')}\n ldflags = #{ldflags} $LDFLAGS"
|
||||
end
|
||||
|
||||
puts "# This set of commands generated by generate_build.rb script\n\n"
|
||||
puts "CC = #{ENV['CC'] || 'clang'}"
|
||||
puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n"
|
||||
puts "CFLAGS = #{ENV['CFLAGS']}"
|
||||
puts "CXXFLAGS = #{ENV['CXXFLAGS']}"
|
||||
puts "LDFLAGS = #{ENV['LDFLAGS']}"
|
||||
puts "PKGVER = #{ENV['PKGVER']}\n\n"
|
||||
|
||||
|
||||
puts """
|
||||
rule cc
|
||||
command = $CC $cflags -c $in -o $out
|
||||
|
||||
rule cxx
|
||||
command = $CXX $cflags -c $in -o $out
|
||||
|
||||
rule link
|
||||
command = $CXX $ldflags $LDFLAGS $in -o $out
|
||||
|
||||
|
||||
"""
|
||||
|
||||
adbdfiles = %w(
|
||||
adb.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
|
||||
transport_mdns_unsupported.cpp
|
||||
fdevent.cpp
|
||||
adb_auth_host.cpp
|
||||
shell_service_protocol.cpp
|
||||
)
|
||||
libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include')
|
||||
|
||||
adbfiles = %w(
|
||||
console.cpp
|
||||
socket_spec.cpp
|
||||
commandline.cpp
|
||||
adb_client.cpp
|
||||
services.cpp
|
||||
file_sync_client.cpp
|
||||
sysdeps_unix.cpp
|
||||
sysdeps/errno.cpp
|
||||
client/main.cpp
|
||||
client/usb_dispatch.cpp
|
||||
client/usb_linux.cpp
|
||||
client/usb_libusb.cpp
|
||||
sysdeps/posix/network.cpp
|
||||
)
|
||||
libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb')
|
||||
|
||||
basefiles = %w(
|
||||
file.cpp
|
||||
logging.cpp
|
||||
parsenetaddress.cpp
|
||||
stringprintf.cpp
|
||||
strings.cpp
|
||||
errors_unix.cpp
|
||||
test_utils.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
|
||||
config_read.c
|
||||
logger_lock.c
|
||||
local_logger.c
|
||||
fake_writer.c
|
||||
logger_name.c
|
||||
stderr_write.c
|
||||
logprint.c
|
||||
)
|
||||
liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include')
|
||||
|
||||
cutilsfiles = %w(
|
||||
load_file.cpp
|
||||
socket_local_client_unix.cpp
|
||||
socket_network_client_unix.cpp
|
||||
socket_local_server_unix.cpp
|
||||
sockets_unix.cpp
|
||||
socket_inaddr_any_server_unix.cpp
|
||||
sockets.cpp
|
||||
android_get_control_file.cpp
|
||||
threads.cpp
|
||||
fs_config.cpp
|
||||
canned_fs_config.cpp
|
||||
)
|
||||
libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/libcutils/include -Icore/include')
|
||||
|
||||
diagnoseusbfiles = %w(
|
||||
diagnose_usb.cpp
|
||||
)
|
||||
libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include')
|
||||
|
||||
libcryptofiles = %w(
|
||||
android_pubkey.c
|
||||
)
|
||||
libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), '-Icore/libcrypto_utils/include -Iboringssl/include')
|
||||
|
||||
# TODO: make subninja working
|
||||
#boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a'])
|
||||
boringssl = ['boringssl/build/crypto/libcrypto.a']
|
||||
|
||||
link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, '-lpthread -lusb-1.0')
|
||||
|
||||
|
||||
fastbootfiles = %w(
|
||||
protocol.cpp
|
||||
engine.cpp
|
||||
bootimg_utils.cpp
|
||||
fastboot.cpp
|
||||
util.cpp
|
||||
fs.cpp
|
||||
usb_linux.cpp
|
||||
socket.cpp
|
||||
tcp.cpp
|
||||
udp.cpp
|
||||
)
|
||||
libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg')
|
||||
|
||||
sparsefiles = %w(
|
||||
backed_block.c
|
||||
output_file.c
|
||||
sparse.c
|
||||
sparse_crc32.c
|
||||
sparse_err.c
|
||||
sparse_read.cpp
|
||||
)
|
||||
libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include')
|
||||
|
||||
f2fsfiles = %w(
|
||||
)
|
||||
f2fs = compile(expand("extras/f2fs_utils", f2fsfiles), "-DHAVE_LINUX_TYPES_H -If2fs-tools/include -Icore/liblog/include")
|
||||
|
||||
zipfiles = %w(
|
||||
zip_archive.cc
|
||||
)
|
||||
libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include -Icore/libziparchive/include')
|
||||
|
||||
utilfiles = %w(
|
||||
FileMap.cpp
|
||||
)
|
||||
libutil = compile(expand('core/libutils', utilfiles), '-Icore/include')
|
||||
|
||||
ext4files = %w(
|
||||
ext4_utils.c
|
||||
wipe.c
|
||||
ext4_sb.c
|
||||
)
|
||||
libext4 = compile(expand('extras/ext4_utils', ext4files), '-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include')
|
||||
|
||||
selinuxfiles = %w(
|
||||
callbacks.c
|
||||
check_context.c
|
||||
freecon.c
|
||||
init.c
|
||||
label.c
|
||||
label_file.c
|
||||
label_support.c
|
||||
setrans_client.c
|
||||
regex.c
|
||||
matchpathcon.c
|
||||
selinux_config.c
|
||||
label_backends_android.c
|
||||
canonicalize_context.c
|
||||
lsetfilecon.c
|
||||
policyvers.c
|
||||
lgetfilecon.c
|
||||
load_policy.c
|
||||
seusers.c
|
||||
sha1.c
|
||||
booleans.c
|
||||
disable.c
|
||||
enabled.c
|
||||
getenforce.c
|
||||
setenforce.c
|
||||
)
|
||||
libselinux = compile(expand('selinux/libselinux/src', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include')
|
||||
|
||||
libsepolfiles = %w(
|
||||
policydb_public.c
|
||||
genbools.c
|
||||
debug.c
|
||||
policydb.c
|
||||
conditional.c
|
||||
services.c
|
||||
ebitmap.c
|
||||
util.c
|
||||
assertion.c
|
||||
avtab.c
|
||||
hashtab.c
|
||||
sidtab.c
|
||||
context.c
|
||||
genusers.c
|
||||
context_record.c
|
||||
mls.c
|
||||
avrule_block.c
|
||||
symtab.c
|
||||
policydb_convert.c
|
||||
write.c
|
||||
constraint.c
|
||||
expand.c
|
||||
hierarchy.c
|
||||
)
|
||||
libsepol = compile(expand('selinux/libsepol/src', libsepolfiles), '-Iselinux/libsepol/include')
|
||||
|
||||
link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb, '-lz -lpcre2-8 -lpthread -ldl')
|
||||
|
||||
|
||||
# mke2fs.android - a ustom version of mke2fs that supports --android_sparse (FS#56955)
|
||||
libext2fsfiles = %w(
|
||||
lib/blkid/cache.c
|
||||
lib/blkid/dev.c
|
||||
lib/blkid/devname.c
|
||||
lib/blkid/devno.c
|
||||
lib/blkid/getsize.c
|
||||
lib/blkid/llseek.c
|
||||
lib/blkid/probe.c
|
||||
lib/blkid/read.c
|
||||
lib/blkid/resolve.c
|
||||
lib/blkid/save.c
|
||||
lib/blkid/tag.c
|
||||
lib/e2p/feature.c
|
||||
lib/e2p/hashstr.c
|
||||
lib/e2p/mntopts.c
|
||||
lib/e2p/ostype.c
|
||||
lib/e2p/parse_num.c
|
||||
lib/e2p/uuid.c
|
||||
lib/et/com_err.c
|
||||
lib/et/error_message.c
|
||||
lib/et/et_name.c
|
||||
lib/ext2fs/alloc.c
|
||||
lib/ext2fs/alloc_sb.c
|
||||
lib/ext2fs/alloc_stats.c
|
||||
lib/ext2fs/alloc_tables.c
|
||||
lib/ext2fs/atexit.c
|
||||
lib/ext2fs/badblocks.c
|
||||
lib/ext2fs/bb_inode.c
|
||||
lib/ext2fs/bitmaps.c
|
||||
lib/ext2fs/bitops.c
|
||||
lib/ext2fs/blkmap64_ba.c
|
||||
lib/ext2fs/blkmap64_rb.c
|
||||
lib/ext2fs/blknum.c
|
||||
lib/ext2fs/block.c
|
||||
lib/ext2fs/bmap.c
|
||||
lib/ext2fs/closefs.c
|
||||
lib/ext2fs/crc16.c
|
||||
lib/ext2fs/crc32c.c
|
||||
lib/ext2fs/csum.c
|
||||
lib/ext2fs/dirblock.c
|
||||
lib/ext2fs/dir_iterate.c
|
||||
lib/ext2fs/expanddir.c
|
||||
lib/ext2fs/ext2_err.c
|
||||
lib/ext2fs/ext_attr.c
|
||||
lib/ext2fs/extent.c
|
||||
lib/ext2fs/fallocate.c
|
||||
lib/ext2fs/fileio.c
|
||||
lib/ext2fs/freefs.c
|
||||
lib/ext2fs/gen_bitmap64.c
|
||||
lib/ext2fs/gen_bitmap.c
|
||||
lib/ext2fs/get_num_dirs.c
|
||||
lib/ext2fs/getsectsize.c
|
||||
lib/ext2fs/getsize.c
|
||||
lib/ext2fs/hashmap.c
|
||||
lib/ext2fs/i_block.c
|
||||
lib/ext2fs/ind_block.c
|
||||
lib/ext2fs/initialize.c
|
||||
lib/ext2fs/inline.c
|
||||
lib/ext2fs/inline_data.c
|
||||
lib/ext2fs/inode.c
|
||||
lib/ext2fs/io_manager.c
|
||||
lib/ext2fs/ismounted.c
|
||||
lib/ext2fs/link.c
|
||||
lib/ext2fs/llseek.c
|
||||
lib/ext2fs/lookup.c
|
||||
lib/ext2fs/mkdir.c
|
||||
lib/ext2fs/mkjournal.c
|
||||
lib/ext2fs/mmp.c
|
||||
lib/ext2fs/namei.c
|
||||
lib/ext2fs/newdir.c
|
||||
lib/ext2fs/openfs.c
|
||||
lib/ext2fs/progress.c
|
||||
lib/ext2fs/punch.c
|
||||
lib/ext2fs/rbtree.c
|
||||
lib/ext2fs/read_bb.c
|
||||
lib/ext2fs/read_bb_file.c
|
||||
lib/ext2fs/res_gdt.c
|
||||
lib/ext2fs/rw_bitmaps.c
|
||||
lib/ext2fs/sha512.c
|
||||
lib/ext2fs/sparse_io.c
|
||||
lib/ext2fs/symlink.c
|
||||
lib/ext2fs/undo_io.c
|
||||
lib/ext2fs/unix_io.c
|
||||
lib/ext2fs/valid_blk.c
|
||||
lib/support/dict.c
|
||||
lib/support/mkquota.c
|
||||
lib/support/parse_qtype.c
|
||||
lib/support/plausible.c
|
||||
lib/support/prof_err.c
|
||||
lib/support/profile.c
|
||||
lib/support/quotaio.c
|
||||
lib/support/quotaio_tree.c
|
||||
lib/support/quotaio_v2.c
|
||||
lib/uuid/gen_uuid.c
|
||||
lib/uuid/isnull.c
|
||||
lib/uuid/pack.c
|
||||
lib/uuid/parse.c
|
||||
lib/uuid/unpack.c
|
||||
lib/uuid/unparse.c
|
||||
misc/create_inode.c
|
||||
)
|
||||
libext2fs = compile(expand("e2fsprogs", libext2fsfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include")
|
||||
|
||||
|
||||
mke2fsfiles = %w(
|
||||
misc/default_profile.c
|
||||
misc/mke2fs.c
|
||||
misc/mk_hugefiles.c
|
||||
misc/util.c
|
||||
)
|
||||
mke2fs = compile(expand('e2fsprogs', mke2fsfiles), '-Ie2fsprogs/lib')
|
||||
|
||||
link('mke2fs.android', mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lpthread -lz')
|
||||
|
||||
|
||||
e2fsdroidfiles = %w(
|
||||
contrib/android/e2fsdroid.c
|
||||
contrib/android/basefs_allocator.c
|
||||
contrib/android/block_range.c
|
||||
contrib/android/base_fs.c
|
||||
contrib/android/fsmap.c
|
||||
contrib/android/block_list.c
|
||||
contrib/android/perms.c
|
||||
)
|
||||
e2fsdroid = compile(expand("e2fsprogs", e2fsdroidfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc")
|
||||
|
||||
link('e2fsdroid', e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, '-lz -lpthread -lpcre2-8')
|
||||
|
||||
|
||||
ext2simgfiles = %w(
|
||||
contrib/android/ext2simg.c
|
||||
)
|
||||
ext2simg = compile(expand('e2fsprogs', ext2simgfiles), '-Ie2fsprogs/lib -Icore/libsparse/include')
|
||||
|
||||
link('ext2simg', ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, '-lz -lpthread')
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
pkgname=android-tools
|
||||
version=29.0.3
|
||||
revision=1
|
||||
archs="armv7l* aarch64* x86_64* i686*"
|
||||
archs="armv* aarch64* x86_64* i686*"
|
||||
build_style=cmake
|
||||
configure_args="-DCMAKE_CXX_FLAGS=-D_FILE_OFFSET_BITS=64
|
||||
-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64"
|
||||
|
|
@ -15,6 +15,11 @@ homepage="http://developer.android.com/tools/help/adb.html"
|
|||
distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
|
||||
checksum=4cf79878356428b290eb5e659e7daebe036cbb99cf8c2dacb92586b2a5f856fc
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
armv[56]*) makedepends+=" libatomic-devel"
|
||||
;;
|
||||
esac
|
||||
|
||||
pre_configure() {
|
||||
# Don't check for CROSS_COMPILING, since i686 container/chroot inside
|
||||
# x86_64 host will failed to build this.
|
||||
|
|
@ -30,6 +35,11 @@ pre_configure() {
|
|||
configure_args+=" ${boring_ssl_cmake_args}"
|
||||
fi
|
||||
|
||||
case "${XBPS_TARGET_MACHINE}" in
|
||||
armv[56]*) sed -i vendor/CMakeLists.adb.txt \
|
||||
-e "/target_link_libraries/s;$; atomic;"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
post_install() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue