Justin Koh
303d275591
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
...
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.
Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
2014-02-03 16:26:43 -08:00
Noreen Tolland
c816e06127
Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
2014-01-31 23:13:24 +00:00
Justin Mattson
b60a3f97d1
(DO NOT MERGE) Revert "Make libart the default runtime"
...
This reverts commit 08d410f532
.
2014-01-30 15:30:08 -08:00
Nick Vaccaro
ec0c99a6c5
Add atrace for supporting systrace tool
...
Change-Id: I6504a447218a70b0d148c0b5802228fb28934a0a
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
2014-01-30 20:33:46 +00:00
Colin Cross
e39bb7ea46
am 190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-dev
...
* commit '190ebe94e1a3c18183fa1940e7599b4d6f70b470':
pdk: add android_common.jar
2014-01-30 00:59:55 +00:00
Colin Cross
190ebe94e1
Merge "pdk: add android_common.jar" into klp-volantis-dev
2014-01-30 00:53:56 +00:00
Scott Main
2277038372
am bb783f27: am a6e8c6c1: am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
...
* commit 'bb783f27bd0de3fc25d47dd7b00df62ca9504f7a':
add 'get started' link to the bottom of class home pages
2014-01-29 20:17:05 +00:00
Scott Main
bb783f27bd
am a6e8c6c1: am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
...
* commit 'a6e8c6c1e0f659b3532bd86631104360b54016ea':
add 'get started' link to the bottom of class home pages
2014-01-29 20:15:01 +00:00
Scott Main
a6e8c6c1e0
am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
...
* commit 'f72e1846898ec07cedf301ac76875cfa9f1164bc':
add 'get started' link to the bottom of class home pages
2014-01-29 20:11:48 +00:00
Scott Main
f72e184689
am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
...
* commit 'c9e142e62d60b39bb5bd3459358a16c00fc557f3':
add 'get started' link to the bottom of class home pages
2014-01-29 20:08:49 +00:00
Scott Main
c9e142e62d
Merge "add 'get started' link to the bottom of class home pages" into klp-docs
2014-01-29 20:07:13 +00:00
Colin Cross
4b764993a9
pdk: add android_common.jar
...
Add android_common.jar to the pdk java libraries to allow partners
to build test apps against it.
Change-Id: I3f3c0f6ef086489aec293e10b0d707845b174655
2014-01-29 10:01:37 -08:00
Elliott Hughes
07ada634a1
am 833188c1: am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread."
...
* commit '833188c16ea5d2f12aa0108119c327d6cd31d4ea':
gtest needs -lpthread.
2014-01-29 01:55:36 +00:00
Elliott Hughes
833188c16e
am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread."
...
* commit 'e7bd4f5cdf5d1ac0c49d42ed41322f10e7f34f9b':
gtest needs -lpthread.
2014-01-29 01:53:14 +00:00
Elliott Hughes
e7bd4f5cdf
am 472a4858: Merge "gtest needs -lpthread."
...
* commit '472a48585ec1cfb66c5716f85b0efdf528b29f5d':
gtest needs -lpthread.
2014-01-29 01:50:34 +00:00
Elliott Hughes
472a48585e
Merge "gtest needs -lpthread."
2014-01-29 01:45:17 +00:00
Elliott Hughes
52e52d1447
gtest needs -lpthread.
...
Host gtests that don't use pthreads themselves need to be linked
against libpthread because gtest itself uses pthreads to ensure
thread-safety. (It can't know in advance whether the code under
test is going to spin up threads, so it has to be pessimistic.)
Change-Id: I14fb1098c163d7fe6ae9a9a0314acead4ec9383d
2014-01-28 17:32:30 -08:00
Brian Carlstrom
0b0d6277e0
am be7575ec: am cba215dd: am d21197d5: Merge "Make libart the default runtime"
...
* commit 'be7575ecb1827784f83582847749aa59c664d29e':
Make libart the default runtime
2014-01-29 00:44:02 +00:00
Brian Carlstrom
be7575ecb1
am cba215dd: am d21197d5: Merge "Make libart the default runtime"
...
* commit 'cba215dd3241ae62416800f8d97d114d8a6e1a9a':
Make libart the default runtime
2014-01-29 00:41:31 +00:00
Brian Carlstrom
cba215dd32
am d21197d5: Merge "Make libart the default runtime"
...
* commit 'd21197d50caaa025bd823a004984a2820bb3c2e2':
Make libart the default runtime
2014-01-29 00:39:45 +00:00
Brian Carlstrom
d21197d50c
Merge "Make libart the default runtime"
2014-01-29 00:32:23 +00:00
Elliott Hughes
bc528c22b8
am f7784e46: am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
...
* commit 'f7784e46170e90cb38ddbab15b7aa3a4a7e2d07d':
Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:37:15 +00:00
Elliott Hughes
f7784e4617
am 1a0e8501: am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
...
* commit '1a0e850141fe19e1f1d503822893b8d66c0bca69':
Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:35:25 +00:00
Elliott Hughes
1a0e850141
am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
...
* commit '1a731adf943bc716cc7b9c95b321db02ad7216db':
Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:29:52 +00:00
Elliott Hughes
1a731adf94
Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
2014-01-28 21:23:07 +00:00
Elliott Hughes
171e940c7a
Fix KERNEL_HEADERS_ARCH for mips and x86.
...
arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64
use headers that work for both widths. So where arm/arm64 need to handle the
second architecture case specially, all we need to do for the others is
hard-code the name. (x86_64.mk already hard-codes x86; we need to change
x86.mk for the case where we're building the 32-bit binaries for a mixed
system. mips64.mk doesn't exist yet, but when it does, it'll hard-code
just plain "mips" too.)
Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
2014-01-28 13:10:19 -08:00
Brian Carlstrom
1737b1ab5f
am dc5dd9b4: am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
...
* commit 'dc5dd9b47fe2a24410b3e70d320655f1b5455966':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
2014-01-28 20:54:10 +00:00
Brian Carlstrom
dc5dd9b47f
am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
...
* commit 'd3737d07c8adb0848dcddb7df03d1e6b4378ab93':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
2014-01-28 20:52:17 +00:00
Brian Carlstrom
d3737d07c8
am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
...
* commit '49eb440980db6680ec08c48b416e37e937bf9003':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
2014-01-28 20:50:19 +00:00
Brian Carlstrom
49eb440980
Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
2014-01-28 20:45:32 +00:00
Brian Carlstrom
8fb5dfc5c7
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
...
(cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175)
Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
2014-01-28 11:29:58 -08:00
Brian Carlstrom
08d410f532
Make libart the default runtime
...
Change-Id: I4394f2bdef6f1be36f0f17f3b42d3e62bc2245ef
2014-01-28 09:52:15 -08:00
Colin Cross
23710e27bc
am cb1ad445: am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
...
* commit 'cb1ad445663d190e204330b596b52e4734d9dcf0':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:37:21 +00:00
Colin Cross
cb1ad44566
am 0d24616d: am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
...
* commit '0d24616dd1b29e016aaae86761574fd88d701b6d':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:34:05 +00:00
Colin Cross
0d24616dd1
am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
...
* commit 'cdd1475834156b2e45b73ae86a949efa6c1215eb':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:31:18 +00:00
Colin Cross
cdd1475834
Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
2014-01-28 02:25:45 +00:00
Colin Cross
8f47fc379e
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
...
To ease the transition between toolchains, allow a target to specify
a list of cflags that the toolchain does not support. These will be
filtered out of the cflags provided by the module.
Add TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector for the
aarch64 toolchain, it does not yet suport -fstack-protector.
Change-Id: I168d0c6f131326fad305ec86fad46e6a3e03295a
2014-01-27 18:21:12 -08:00
Elliott Hughes
6fe9a94989
am 69c36ee7: am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
...
* commit '69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
Remove libthread_db from the default include path.
2014-01-28 00:59:15 +00:00
Elliott Hughes
69c36ee7a8
am 4fbf23ef: am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
...
* commit '4fbf23ef8267849ce88217a256b394de3904a4f6':
Remove libthread_db from the default include path.
2014-01-28 00:54:33 +00:00
Elliott Hughes
4fbf23ef82
am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
...
* commit '0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
Remove libthread_db from the default include path.
2014-01-28 00:43:29 +00:00
Ying Wang
0064dceb19
am a8d15474: am 04cff708: resolved conflicts for merge of 7382ec7d
to klp-dev-plus-aosp
...
* commit 'a8d15474ebb7b595f842ffb23a36cce9bc382f10':
ota_from_target_files: Add an option to not sign OTA packages
2014-01-28 00:08:19 +00:00
Ying Wang
a8d15474eb
am 04cff708: resolved conflicts for merge of 7382ec7d
to klp-dev-plus-aosp
...
* commit '04cff70804810d27e1fcbef556ebfdc39278d746':
ota_from_target_files: Add an option to not sign OTA packages
2014-01-28 00:00:50 +00:00
Elliott Hughes
0a3cf1a0e5
Merge "Remove libthread_db from the default include path."
2014-01-28 00:00:19 +00:00
Ying Wang
04cff70804
resolved conflicts for merge of 7382ec7d
to klp-dev-plus-aosp
...
Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52
2014-01-27 15:56:45 -08:00
Colin Cross
8c89a9ff9c
am 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
...
* commit '4695598df1fa11064a54421f60fee66032c673ee':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 23:46:39 +00:00
Elliott Hughes
2f8dcdd961
Remove libthread_db from the default include path.
...
This should never have been on the default include path.
The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.
Bug: 11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
2014-01-27 15:45:17 -08:00
Colin Cross
4695598df1
am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
...
* commit 'ae49acbde766e2e683d3dd026e69f2416da766b1':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 23:43:33 +00:00
Ying Wang
3e3a56adf2
am ae1c7d96: am 50c548c8: am 25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
...
* commit 'ae1c7d960715ec90afa4accf0754f176d088a30f':
Don't modify LOCAL_MODULE_TAGS.
2014-01-27 23:42:11 +00:00
Colin Cross
ae49acbde7
am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
...
* commit '1acb1b64b9be43503fa2a9949858b8bb36417e32':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
2014-01-27 15:40:22 -08:00
Ying Wang
7382ec7db8
Merge "ota_from_target_files: Add an option to not sign OTA packages"
2014-01-27 23:37:18 +00:00