summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am d954c6b9: am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."Narayan Kamath2014-04-151-4/+1
|\
| * am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."Narayan Kamath2014-04-151-4/+1
| |\
| | * Merge ""desktop" linux has Posix clocks."Narayan Kamath2014-04-151-4/+1
| | |\
| | | * "desktop" linux has Posix clocks.Narayan Kamath2014-04-101-4/+1
* | | | LOCAL_CERTIFICATE only applies to APPS.Ying Wang2014-04-151-7/+4
* | | | am 25313cd3: am 59cc3f5d: am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"Colin Cross2014-04-122-14/+2
|\ \ \ \ | |/ / /
| * | | am 59cc3f5d: am 5b1fa1c8: Merge "build: remove LOCAL_NO_2ND_ARCH"Colin Cross2014-04-122-14/+2
| |\ \ \ | | |/ /
| | * | Merge "build: remove LOCAL_NO_2ND_ARCH"Colin Cross2014-04-122-14/+2
| | |\ \
| | | * | build: remove LOCAL_NO_2ND_ARCHColin Cross2014-04-112-14/+2
* | | | | am e921da9d: am bddce34c: am 065c4180: Merge "Revert "Use aarch64-linux-andro...Ben Cheng2014-04-111-5/+6
|\ \ \ \ \ | |/ / / /
| * | | | am bddce34c: am 065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for ar...Ben Cheng2014-04-111-5/+6
| |\ \ \ \ | | |/ / /
| | * | | Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"Ben Cheng2014-04-111-5/+6
| | |/ /
* | | | am c9f9decd: am 4eea070c: am f702d6d1: Merge "Use aarch64-linux-android-4.9 f...Ben Cheng2014-04-111-6/+5
|\ \ \ \ | |/ / /
| * | | am 4eea070c: am f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 buil...Ben Cheng2014-04-111-6/+5
| |\ \ \ | | |/ /
| | * | Use aarch64-linux-android-4.9 for arm64 build (attempt #2)Ben Cheng2014-04-111-6/+5
* | | | am e4d787bf: am 7e793040: am eec11d97: Merge "Decouple platform compiler and ...Ben Cheng2014-04-117-3/+21
|\ \ \ \ | |/ / /
| * | | am 7e793040: am eec11d97: Merge "Decouple platform compiler and NDK library v...Ben Cheng2014-04-117-3/+21
| |\ \ \ | | |/ /
| | * | Merge "Decouple platform compiler and NDK library versioning."Ben Cheng2014-04-117-3/+21
| | |\ \
| | | * | Decouple platform compiler and NDK library versioning.Ben Cheng2014-04-107-3/+21
* | | | | am 14203772: am 3221717f: am a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f...Colin Cross2014-04-115-32/+76
|\ \ \ \ \ | |/ / / /
| * | | | am 3221717f: am a355ae12: Merge changes I2c10e41f,I5b5e23f1,If3f5a81c,I07520b75Colin Cross2014-04-115-32/+76
| |\ \ \ \ | | |/ / /
| | * | | build: remove packages/ from 64-bit blacklistColin Cross2014-04-101-4/+0
| | * | | build: use TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPSColin Cross2014-04-101-0/+33
| | * | | build: add support for LOCAL_MULTILIB := 64Colin Cross2014-04-102-1/+5
| | * | | build: fix TARGET_PREFER_32_BITColin Cross2014-04-102-29/+40
| | |/ /
* | | | am c77ffa89: am add6c037: am 13eaf184: Merge "Revert "Use aarch64-linux-andro...Ben Cheng2014-04-101-5/+6
|\ \ \ \ | |/ / /
| * | | am add6c037: am 13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for ar...Ben Cheng2014-04-101-5/+6
| |\ \ \ | | |/ /
| | * | Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""Ben Cheng2014-04-101-5/+6
| | |\ \
| | | * | Revert "Use aarch64-linux-android-4.9 for arm64 build."Ben Cheng2014-04-101-5/+6
* | | | | am 9cbf732f: am 98bb9d6c: am d957d6bb: Merge "Use aarch64-linux-android-4.9 f...Ben Cheng2014-04-101-6/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 98bb9d6c: am d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."Ben Cheng2014-04-101-6/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "Use aarch64-linux-android-4.9 for arm64 build."Ben Cheng2014-04-101-6/+5
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | | * Use aarch64-linux-android-4.9 for arm64 build.Ben Cheng2014-04-091-6/+5
* | | | Pass OEM property list to OTA tools, thumbprint.Jeff Sharkey2014-04-091-2/+16
* | | | am 09ba20ce: am fd251b33: am 1a4676a1: Merge "Increase the maximum javac heap...Ying Wang2014-04-091-1/+1
|\ \ \ \ | |/ / /
| * | | am fd251b33: am 1a4676a1: Merge "Increase the maximum javac heap size again."Ying Wang2014-04-091-1/+1
| |\ \ \ | | |/ /
| | * | Increase the maximum javac heap size again.Ying Wang2014-04-091-1/+1
| | |/
* | | am 6c0fba0f: am ae44bb55: am 94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MO...Narayan Kamath2014-04-099-54/+0
|\ \ \ | |/ /
| * | am ae44bb55: am 94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."Narayan Kamath2014-04-099-54/+0
| |\ \ | | |/
| | * Stop defining HAVE_TIMEDWAIT_MONOTONIC.Narayan Kamath2014-04-099-54/+0
* | | Merge "Import OEM build properties, if defined."Jeff Sharkey2014-04-092-3/+12
|\ \ \
| * | | Import OEM build properties, if defined.Jeff Sharkey2014-03-212-3/+12
* | | | resolved conflicts for merge of 8af7e8ed to masterNarayan Kamath2014-04-093-22/+40
|\ \ \ \ | | |/ / | |/| |
| * | | resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aospNarayan Kamath2014-04-093-22/+40
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Add 32 / 64 bit abi lists to system properties."Narayan Kamath2014-04-093-22/+40
| | |\ \
| | | * | Add 32 / 64 bit abi lists to system properties.Narayan Kamath2014-04-083-22/+40
* | | | | Preserve symlinked OUT_DIR by only clearing contentsAlan Viverette2014-04-071-1/+1
* | | | | am c9c3ed22: am 5d33de08: am bdac8cf1: Merge "Fix javadoc error "class file f...Ying Wang2014-04-071-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 5d33de08: am bdac8cf1: Merge "Fix javadoc error "class file for sun.util.r...Ying Wang2014-04-071-0/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceB...Ying Wang2014-04-071-0/+2
| | |\ \ \