commit | b9d4238383fdd265e06a1996c37a36b0e7b2cc67 | [log] [tgz] |
---|---|---|
author | David 'Digit' Turner <digit@google.com> | Thu Jun 12 17:53:30 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 12 17:53:30 2014 +0000 |
tree | 9d548f8e2bdc25fba14c40390f8d0db62a6c812b | |
parent | bc21f9af72c7c9c0d113d06da33d1c88b20bc095 [diff] | |
parent | 3f3fb0c467e47766955cc3e67d1f5f30137429b2 [diff] |
am 3f3fb0c4: Merge "resolve merge conflicts of 598e05b to master." * commit '3f3fb0c467e47766955cc3e67d1f5f30137429b2': Read build.prop file when provided in AVD. Simplify build of 64-bit binaries. android-configure.sh: Fix linker probe check. Generate position-independent binaries. mini-glib: Only compile glib-win32.c when needed. Remove obsolete HOST_LONGBITS feature check.