I forgot to say, that I put the full tree I worked on at http://www.contrib.andrew.cmu.edu/~rjkohler/ for reference.
On Sat, Dec 13, 2014 at 6:17 PM, Ray Kohler <ataraxia...@gmail.com> wrote: > Package: src:android-tools > Followup-For: Bug #738119 > > Although the android-tools packaging is indeed rather bad, I've made an > attempt to update it for 5.0.1. (Integrating it with > android-platform-system-core was beyond my skill.) > > I'm attaching updates of the three custom makefiles supplied under > debian/makefiles. Some comments on the changes I made: > > - AndroidConfig.h is no more, so the build-dep on android-system-dev is > no longer needed. > > - adb doesn't appear to use libzipfile any longer. > > - adb is currently built with -DWORKAROUND_BUG6558362 by upstream, so I > did likewise. > > - fastboot now depends on f2fs_utils, i.e., extras/f2fs_utils and > externals/f2fs-tools. (Debian has an f2fs-tools package, but > apparently no dev package to go with it.) f2fs_utils in turn pulls in > core/include/log and core/include/android. > > - fastboot (or one of its deps, I forgot which) needs > core/include/utils. > > - ext4_utils now needs the selinux headers from external/libselinux, as > Debian's libselinux1-dev doesn't contain android.h. > > - ext4_utils needs -DANDROID and -DHOST to compile correctly. > > There were also some problems with the actual source files, which will > need patches: > > - libzipfile/centraldir.c needs an explicit #define _FILE_OFFSET_BITS 64 > to compile. > > - extras/f2fs_utils/f2fs_sparseblock.c is missing includes for stdlib.h, > string.h, and errno.h. > > - extras/f2fs_utils/f2fs_utils.c is missing an include of string.h. > > As the internal deps continue to grow, it's even more true that the > current build method of this package is a problem. However, since there > are multiple deps on source files outside of the platform/core repo, > integration with android-platform-system-core also feels wrong. Upstream > doesn't make this easy. > > -- System Information: > Debian Release: 8.0 > APT prefers unstable > APT policy: (500, 'unstable') > Architecture: amd64 (x86_64) > > Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores) > Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > Init: systemd (via /run/systemd/system) >
