Ed Heyl
813b4f27b7
merge 601d39b688
...
Change-Id: I9795ab63b29481de392a8672d272082270894e1f
2014-02-03 09:47:42 -08:00
Ian Rogers
d671e2ac95
am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
...
* commit 'e854276dd19ee0ce139cc35f98b49189b7750b2d':
Disable WITH_HOST_DALVIK on 64bit host builds.
2014-01-31 15:12:37 -08:00
Narayan Kamath
d514cf041d
am ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
...
* commit 'ad9209adff8d2f94c57387ee3d3abcff28049091':
Define __STDC_FORMAT_MACROS on Windows host builds.
2014-01-31 14:05:30 -08:00
Colin Cross
f0ae01a66b
am a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
...
* commit 'a8e6166fa482782719dce28a9ae1869f017e7cee':
build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
2014-01-31 08:46:12 -08:00
Colin Cross
f0a420cbeb
am 2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
...
* commit '2dcaf9f489e5dba385ae4ab75c53d184a6fb780a':
build: support LOCAL_*_32 and LOCAL_*_64
2014-01-31 08:46:11 -08:00
Ian Rogers
de353dae2e
am 805cb8fa: Merge "Fix the host inttypes.h problem globally."
...
* commit '805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
Fix the host inttypes.h problem globally.
2014-01-31 08:46:11 -08:00
Brian Carlstrom
2364e30976
am cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
...
* commit 'cece05e273dc1c9d4ea140b294df72005ac8ac53':
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
2014-01-31 08:46:09 -08:00
Nick Vaccaro
572041e6d0
am ec0c99a6: Add atrace for supporting systrace tool
...
* commit 'ec0c99a6c574954fb37bd94ba18b02a20edbe122':
Add atrace for supporting systrace tool
2014-01-30 18:42:15 -08:00
Brian Carlstrom
dbf975507b
build: Rename persist.sys.dalvik.vm.lib to allow new default
...
Bug: 12798969
(cherry picked from commit 49f1fab8a5
)
Change-Id: I7f211fca2b9c99b607dd91590a3e4a82501e0c7f
2014-01-30 16:05:28 -08:00
Brian Carlstrom
601d39b688
Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
2014-01-30 21:50:48 +00:00
Brian Carlstrom
49f1fab8a5
build: Rename persist.sys.dalvik.vm.lib to allow new default
...
Bug: 12798969
Change-Id: Ie73a3f2b6655d0ae3e3a905a1c64747343c525a0
2014-01-30 13:16:37 -08:00
Brian Carlstrom
084209e278
Merge "CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime"
2014-01-30 21:10:25 +00: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
Ian Rogers
e854276dd1
Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
2014-01-30 19:54:04 +00:00
Brian Carlstrom
6acec48274
CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime
...
Change-Id: Id632beeb2f96dd4502ac4a6c03bab5e4252137ff
2014-01-30 11:11:38 -08:00
Ian Rogers
d206afecb8
Disable WITH_HOST_DALVIK on 64bit host builds.
...
Change-Id: I8cea32fe5541c3223e7f317245aab3061e8ad444
2014-01-30 08:55:17 -08:00
Narayan Kamath
ad9209adff
Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
2014-01-30 09:39:33 +00:00
Ian Rogers
694b2b7b12
Define __STDC_FORMAT_MACROS on Windows host builds.
...
Change-Id: I89b54a63c3f111b8242fe9e813d94a839c484195
2014-01-29 21:37:37 -08:00
Colin Cross
a8e6166fa4
Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
2014-01-30 04:06:42 +00:00
Colin Cross
2dcaf9f489
Merge "build: support LOCAL_*_32 and LOCAL_*_64"
2014-01-30 04:06:05 +00:00
Colin Cross
78d642f426
build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
...
Rename for consistency with TARGET_IS_64_BIT.
Change-Id: I824dcaed0c1e88b8246bcffb21ab3f1772175926
2014-01-29 18:35:23 -08:00
Colin Cross
44a752659c
build: support LOCAL_*_32 and LOCAL_*_64
...
Support the following new variables based on whether the current multilib
target is 32 bit or 64 bit:
LOCAL_CFLAGS_32
LOCAL_CFLAGS_64
LOCAL_LDFLAGS_32
LOCAL_LDFLAGS_64
LOCAL_ASFLAGS_32
LOCAL_ASFLAGS_64
LOCAL_C_INCLUDES_32
LOCAL_C_INCLUDES_64
Change-Id: Ia868d56dff114be301bf8297eec768675f186927
2014-01-29 18:35:23 -08:00
Colin Cross
eb2cc42d83
am e39bb7ea: am 190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-dev
...
* commit 'e39bb7ea464894771d44e71b84181b7851f2834f':
pdk: add android_common.jar
2014-01-30 01:58:34 +00:00
Scott Main
062f3564a7
am 22770383: am bb783f27: am a6e8c6c1: am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
...
* commit '2277038372e0e5c2a3f5c5a90f98eded41bc22a9':
add 'get started' link to the bottom of class home pages
2014-01-30 01:58:01 +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
Ian Rogers
805cb8fa40
Merge "Fix the host inttypes.h problem globally."
2014-01-30 00:33:35 +00:00
Ian Rogers
61e5059ef7
Fix the host inttypes.h problem globally.
...
Bug: 12708004
Change-Id: I2c75647bac304b82e150c540b9e6c5568997596d
2014-01-29 16:29:11 -08:00
Brian Carlstrom
cece05e273
Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
2014-01-29 20:21:27 +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
Brian Carlstrom
98529c1e5f
Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
2014-01-29 18:05:29 +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
07e76fe406
am 07ada634: am 833188c1: am e7bd4f5c: am 472a4858: Merge "gtest needs -lpthread."
...
* commit '07ada634a1b6aba9d77bf2df07342f25a48a7637':
gtest needs -lpthread.
2014-01-29 12:49:08 +00:00
Brian Carlstrom
d0df621422
am 0b0d6277: am be7575ec: am cba215dd: am d21197d5: Merge "Make libart the default runtime"
...
* commit '0b0d6277e0b1718265c7aca38bd47611e1199e12':
Make libart the default runtime
2014-01-29 12:20:59 +00:00
Brian Carlstrom
4d662a63a4
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
...
(cherry picked from commit c8501bffcb
)
Change-Id: I12ce7c4e383e74e54d77b54a0406d2499699edbf
2014-01-28 23:43:40 -08:00
Brian Carlstrom
c8501bffcb
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
...
Change-Id: I38d9cb749ec892ba0ba423b0d7c727b27b40b3db
2014-01-28 23:34:15 -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
Brian Carlstrom
03e1caed18
Make libart the default runtime
...
(cherry picked from commit 08d410f532
)
Change-Id: I4e78a03fcd92e52f34be30726e40af287bb67309
2014-01-28 17:41:40 -08: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