summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 9ebb0067: am a37b2bb2: Fix the buildPaul Lawrence2014-11-141-1/+1
|\
| * am a37b2bb2: Fix the buildPaul Lawrence2014-11-141-1/+1
| |\
| | * Fix the buildPaul Lawrence2014-11-141-1/+1
* | | am 3537692d: Merge "Switch --hash-style to gnu"Dmitriy Ivanov2014-11-144-0/+4
|\ \ \
| * \ \ Merge "Switch --hash-style to gnu"Dmitriy Ivanov2014-11-144-0/+4
| |\ \ \
| | * | | Switch --hash-style to gnuDmitriy Ivanov2014-11-134-0/+4
* | | | | am 93efec89: Merge "Pass instruction set variant to dex2oat."Ian Rogers2014-11-144-8/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Pass instruction set variant to dex2oat."Ian Rogers2014-11-144-8/+13
| |\ \ \ \
| | * | | | Pass instruction set variant to dex2oat.Ian Rogers2014-11-084-8/+13
* | | | | | am 2a1697d9: am 8d212ea8: DO NOT MERGE: Change verity key formatsSami Tolvanen2014-11-141-4/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am 8d212ea8: DO NOT MERGE: Change verity key formatsSami Tolvanen2014-11-131-4/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | DO NOT MERGE: Change verity key formatsSami Tolvanen2014-11-131-4/+4
* | | | | | am eddd9fb0: Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-138-68/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-138-68/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | kill HAVE_FORKEXECYabin Cui2014-11-128-68/+0
* | | | | | am d3d6c383: Merge "kill HAVE_LOCALTIME_R"Yabin Cui2014-11-134-20/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | kill HAVE_LOCALTIME_RYabin Cui2014-11-134-20/+0
* | | | | | am 044568be: Merge "kill HAVE_GETHOSTBYNAME_R"Yabin Cui2014-11-133-15/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | kill HAVE_GETHOSTBYNAME_RYabin Cui2014-11-133-15/+0
* | | | | | am 6c706222: Merge "Remove HAVE_SHORT_ENUMS."Elliott Hughes2014-11-132-10/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove HAVE_SHORT_ENUMS.Elliott Hughes2014-11-122-10/+0
| |/ / / /
* | | | | am 957037dc: Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-138-68/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-138-68/+0
| |\ \ \ \
| | * | | | kill HAVE_POSIX_FILEMAPYabin Cui2014-11-118-68/+0
* | | | | | am aea83e0d: Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8"Chih-Hung Hsieh2014-11-122-6/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8"Chih-Hung Hsieh2014-11-122-6/+6
| |\ \ \ \ \
| | * | | | | Upgrade host tool to x86_64-linux-glibc2.15-4.8Chih-Hung Hsieh2014-11-062-6/+6
* | | | | | | am 201f6b3e: Merge "Make modules depend on their makefile."Dan Albert2014-11-1110-28/+68
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Make modules depend on their makefile.Dan Albert2014-11-1110-28/+68
* | | | | | | am 1f637158: Merge "Use platform protobuf unless building with NDK."Dan Albert2014-11-111-2/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Use platform protobuf unless building with NDK."Dan Albert2014-11-111-2/+12
| |\ \ \ \ \ \
| | * | | | | | Use platform protobuf unless building with NDK.Dan Albert2014-11-111-2/+12
* | | | | | | | am b3893943: Merge "Remove unused variables from select.mk."Elliott Hughes2014-11-111-16/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Remove unused variables from select.mk."Elliott Hughes2014-11-111-16/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove unused variables from select.mk.Elliott Hughes2014-11-101-16/+0
* | | | | | | | | am 4dc8e856: Merge "remove __linux__ in AndroidConfig.h"Yabin Cui2014-11-115-61/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | remove __linux__ in AndroidConfig.hYabin Cui2014-11-105-61/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | am 9f00b5a0: Restore the diskinstaller dependency, since it\'s needed for GCE...Greg Hartman2014-11-111-0/+6
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Restore the diskinstaller dependency, since it\'s needed for GCE.Greg Hartman2014-11-111-0/+6
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Restore the diskinstaller dependency, since it's needed for GCE.Greg Hartman2014-11-111-0/+6
* | | | | | | | am 711fe355: Add a hook for the syslinux bootloader. automerge: 4c46710Greg Hartman2014-11-111-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add a hook for the syslinux bootloader.Greg Hartman2014-11-111-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Add a hook for the syslinux bootloader.Greg Hartman2014-11-111-0/+5
* | | | | | | | am 86596342: Merge "kill OS_CASE_SENSITIVE"Yabin Cui2014-11-117-37/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge "kill OS_CASE_SENSITIVE"Yabin Cui2014-11-117-37/+0
| |\ \ \ \ \ \ \
| | * | | | | | | kill OS_CASE_SENSITIVEYabin Cui2014-11-107-37/+0
* | | | | | | | | am d8e38e1b: Merge "kill HAVE_INOTIFY"Yabin Cui2014-11-115-25/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "kill HAVE_INOTIFY"Yabin Cui2014-11-115-25/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | kill HAVE_INOTIFYYabin Cui2014-11-105-25/+0
| | |/ / / / / / /
* | | | | | | | | am 3dbac214: Merge "kill HAVE_STAT_ST_MTIM"Yabin Cui2014-11-117-35/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /