OSDN Git Service
Brian Carlstrom [Fri, 21 Feb 2014 18:29:55 +0000 (10:29 -0800)]
resolved conflicts for merge of
966611a9 to master-nova
Change-Id: Iefe66d7b0bc604460ab18228233ec61c98490b8a
Ian Rogers [Fri, 21 Feb 2014 18:08:29 +0000 (10:08 -0800)]
am
69968b8c: am
1fee45f1: am
e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
* commit '
69968b8c5762a8c7f6127f4aa667b8e8498c5102':
Narayan Kamath [Fri, 21 Feb 2014 18:08:28 +0000 (10:08 -0800)]
am
7201cdef: am
b1aec05a: am
ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
* commit '
7201cdef712a8ff12313de746eb8b0dd4fd8ff51':
Colin Cross [Fri, 21 Feb 2014 18:08:27 +0000 (10:08 -0800)]
am
8c28b594: am
6a7699d5: am
a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
* commit '
8c28b594d9367e43243cd1d014d57204d934539d':
Colin Cross [Fri, 21 Feb 2014 18:08:26 +0000 (10:08 -0800)]
am
92ef2b3d: am
df313a04: am
2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
* commit '
92ef2b3d5b59e7db46bef3ce48b37fa7afafab2b':
Ian Rogers [Fri, 21 Feb 2014 18:08:25 +0000 (10:08 -0800)]
am
0e0b880c: am
eb02fa0a: am
805cb8fa: Merge "Fix the host inttypes.h problem globally."
* commit '
0e0b880c4bf89ff45143e549227e701b6b39958d':
Brian Carlstrom [Fri, 21 Feb 2014 18:08:24 +0000 (10:08 -0800)]
am
8bc31b6d: am
d4e29f52: am
cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
* commit '
8bc31b6d1479b75ecd1b9fc6080529397e067158':
Nick Vaccaro [Fri, 21 Feb 2014 18:08:23 +0000 (10:08 -0800)]
am
2422e761: am
ec0c99a6: Add atrace for supporting systrace tool
* commit '
2422e76192821fb1f14d079de612ea2c5fe9aeae':
Baligh Uddin [Thu, 12 Dec 2013 21:50:41 +0000 (13:50 -0800)]
Add the Telecomm entry in core.mk
Santos Cordon [Wed, 18 Dec 2013 04:26:30 +0000 (20:26 -0800)]
Adding telecomm to build src path for framework.
Change-Id: I36a7df9ed30c949241cc19dd67994883db68394f
Ed Heyl [Mon, 3 Feb 2014 17:47:42 +0000 (09:47 -0800)]
merge
601d39b688bcbb1789e145d1b72753206c24d374
Change-Id: I9795ab63b29481de392a8672d272082270894e1f
Ian Rogers [Fri, 31 Jan 2014 23:12:37 +0000 (15:12 -0800)]
am
e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
* commit '
e854276dd19ee0ce139cc35f98b49189b7750b2d':
Disable WITH_HOST_DALVIK on 64bit host builds.
Narayan Kamath [Fri, 31 Jan 2014 22:05:30 +0000 (14:05 -0800)]
am
ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
* commit '
ad9209adff8d2f94c57387ee3d3abcff28049091':
Define __STDC_FORMAT_MACROS on Windows host builds.
Colin Cross [Fri, 31 Jan 2014 16:46:12 +0000 (08:46 -0800)]
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
Colin Cross [Fri, 31 Jan 2014 16:46:11 +0000 (08:46 -0800)]
am
2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
* commit '
2dcaf9f489e5dba385ae4ab75c53d184a6fb780a':
build: support LOCAL_*_32 and LOCAL_*_64
Ian Rogers [Fri, 31 Jan 2014 16:46:11 +0000 (08:46 -0800)]
am
805cb8fa: Merge "Fix the host inttypes.h problem globally."
* commit '
805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
Fix the host inttypes.h problem globally.
Brian Carlstrom [Fri, 31 Jan 2014 16:46:09 +0000 (08:46 -0800)]
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
Narayan Kamath [Fri, 31 Jan 2014 16:41:27 +0000 (16:41 +0000)]
am
0ddbc6c2: Merge "resolved conflicts for merge of
084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp
* commit '
0ddbc6c215c34f708fcc898be25ddffc18282881':
CleanSpec for
08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime
Ian Rogers [Fri, 31 Jan 2014 16:41:27 +0000 (16:41 +0000)]
am
1fee45f1: am
e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
* commit '
1fee45f1af82d9dbb2e709413f020b2291205640':
Disable WITH_HOST_DALVIK on 64bit host builds.
Narayan Kamath [Fri, 31 Jan 2014 16:41:26 +0000 (16:41 +0000)]
am
b1aec05a: am
ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
* commit '
b1aec05aae44b541aa4c579f7cc700700c91bc0b':
Define __STDC_FORMAT_MACROS on Windows host builds.
Colin Cross [Fri, 31 Jan 2014 16:41:25 +0000 (16:41 +0000)]
am
6a7699d5: am
a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
* commit '
6a7699d5c62d1696305f8debf4c0f90a34ad6009':
build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
Colin Cross [Fri, 31 Jan 2014 16:41:24 +0000 (16:41 +0000)]
am
df313a04: am
2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
* commit '
df313a04a1f5e4e7f3cdc626f7c571a6d12b4dec':
build: support LOCAL_*_32 and LOCAL_*_64
Ian Rogers [Fri, 31 Jan 2014 16:41:24 +0000 (16:41 +0000)]
am
eb02fa0a: am
805cb8fa: Merge "Fix the host inttypes.h problem globally."
* commit '
eb02fa0a6b87682daca29e2ffdd6d7b422acc79f':
Fix the host inttypes.h problem globally.
Brian Carlstrom [Fri, 31 Jan 2014 16:41:23 +0000 (16:41 +0000)]
am
d4e29f52: am
cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
* commit '
d4e29f528aa947ed7bb97596c7a2e9dd47c605e2':
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
Nick Vaccaro [Fri, 31 Jan 2014 16:41:07 +0000 (16:41 +0000)]
am
ec0c99a6: Add atrace for supporting systrace tool
* commit '
ec0c99a6c574954fb37bd94ba18b02a20edbe122':
Add atrace for supporting systrace tool
Narayan Kamath [Fri, 31 Jan 2014 12:33:12 +0000 (12:33 +0000)]
Merge "resolved conflicts for merge of
084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp
Narayan Kamath [Fri, 31 Jan 2014 12:23:28 +0000 (12:23 +0000)]
resolved conflicts for merge of
084209e2 to klp-modular-dev-plus-aosp
Change-Id: Ibf80470cfcaf553335d07c6fb220f7e9ec81ed87
Ian Rogers [Fri, 31 Jan 2014 12:17:16 +0000 (12:17 +0000)]
am
e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
* commit '
e854276dd19ee0ce139cc35f98b49189b7750b2d':
Disable WITH_HOST_DALVIK on 64bit host builds.
Narayan Kamath [Fri, 31 Jan 2014 12:17:03 +0000 (12:17 +0000)]
am
ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
* commit '
ad9209adff8d2f94c57387ee3d3abcff28049091':
Define __STDC_FORMAT_MACROS on Windows host builds.
Colin Cross [Fri, 31 Jan 2014 10:27:06 +0000 (10:27 +0000)]
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
Colin Cross [Fri, 31 Jan 2014 10:27:05 +0000 (10:27 +0000)]
am
2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
* commit '
2dcaf9f489e5dba385ae4ab75c53d184a6fb780a':
build: support LOCAL_*_32 and LOCAL_*_64
Ian Rogers [Fri, 31 Jan 2014 10:26:52 +0000 (10:26 +0000)]
am
805cb8fa: Merge "Fix the host inttypes.h problem globally."
* commit '
805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
Fix the host inttypes.h problem globally.
Brian Carlstrom [Fri, 31 Jan 2014 10:26:48 +0000 (10:26 +0000)]
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
Nick Vaccaro [Fri, 31 Jan 2014 02:42:15 +0000 (18:42 -0800)]
am
ec0c99a6: Add atrace for supporting systrace tool
* commit '
ec0c99a6c574954fb37bd94ba18b02a20edbe122':
Add atrace for supporting systrace tool
Brian Carlstrom [Thu, 30 Jan 2014 21:14:00 +0000 (13:14 -0800)]
build: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
(cherry picked from commit
49f1fab8a5b82f6224ff1be601037270ecdb734b)
Change-Id: I7f211fca2b9c99b607dd91590a3e4a82501e0c7f
Brian Carlstrom [Thu, 30 Jan 2014 21:50:48 +0000 (21:50 +0000)]
Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:00 +0000 (13:14 -0800)]
build: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: Ie73a3f2b6655d0ae3e3a905a1c64747343c525a0
Brian Carlstrom [Thu, 30 Jan 2014 21:10:25 +0000 (21:10 +0000)]
Merge "CleanSpec for
08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime"
Nick Vaccaro [Fri, 24 Jan 2014 18:19:21 +0000 (10:19 -0800)]
Add atrace for supporting systrace tool
Change-Id: I6504a447218a70b0d148c0b5802228fb28934a0a
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Ian Rogers [Thu, 30 Jan 2014 19:54:04 +0000 (19:54 +0000)]
Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
Brian Carlstrom [Thu, 30 Jan 2014 19:11:38 +0000 (11:11 -0800)]
CleanSpec for
08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime
Change-Id: Id632beeb2f96dd4502ac4a6c03bab5e4252137ff
Ian Rogers [Thu, 30 Jan 2014 16:47:53 +0000 (08:47 -0800)]
Disable WITH_HOST_DALVIK on 64bit host builds.
Change-Id: I8cea32fe5541c3223e7f317245aab3061e8ad444
Narayan Kamath [Thu, 30 Jan 2014 09:39:33 +0000 (09:39 +0000)]
Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
Ian Rogers [Thu, 30 Jan 2014 05:37:37 +0000 (21:37 -0800)]
Define __STDC_FORMAT_MACROS on Windows host builds.
Change-Id: I89b54a63c3f111b8242fe9e813d94a839c484195
Colin Cross [Thu, 30 Jan 2014 04:06:42 +0000 (04:06 +0000)]
Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
Colin Cross [Thu, 30 Jan 2014 04:06:05 +0000 (04:06 +0000)]
Merge "build: support LOCAL_*_32 and LOCAL_*_64"
Colin Cross [Thu, 30 Jan 2014 02:20:01 +0000 (18:20 -0800)]
build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
Rename for consistency with TARGET_IS_64_BIT.
Change-Id: I824dcaed0c1e88b8246bcffb21ab3f1772175926
Colin Cross [Thu, 30 Jan 2014 01:46:37 +0000 (17:46 -0800)]
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
Colin Cross [Thu, 30 Jan 2014 01:58:34 +0000 (01:58 +0000)]
am
e39bb7ea: am
190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-dev
* commit '
e39bb7ea464894771d44e71b84181b7851f2834f':
pdk: add android_common.jar
Scott Main [Thu, 30 Jan 2014 01:58:01 +0000 (01:58 +0000)]
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
Colin Cross [Thu, 30 Jan 2014 00:59:55 +0000 (00:59 +0000)]
am
190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-dev
* commit '
190ebe94e1a3c18183fa1940e7599b4d6f70b470':
pdk: add android_common.jar
Colin Cross [Thu, 30 Jan 2014 00:53:55 +0000 (00:53 +0000)]
Merge "pdk: add android_common.jar" into klp-volantis-dev
Ian Rogers [Thu, 30 Jan 2014 00:33:35 +0000 (00:33 +0000)]
Merge "Fix the host inttypes.h problem globally."
Ian Rogers [Wed, 29 Jan 2014 21:09:30 +0000 (13:09 -0800)]
Fix the host inttypes.h problem globally.
Bug:
12708004
Change-Id: I2c75647bac304b82e150c540b9e6c5568997596d
Brian Carlstrom [Wed, 29 Jan 2014 20:21:27 +0000 (20:21 +0000)]
Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
Scott Main [Wed, 29 Jan 2014 20:17:05 +0000 (20:17 +0000)]
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
Scott Main [Wed, 29 Jan 2014 20:15:01 +0000 (20:15 +0000)]
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
Scott Main [Wed, 29 Jan 2014 20:11:48 +0000 (20:11 +0000)]
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
Scott Main [Wed, 29 Jan 2014 20:08:49 +0000 (20:08 +0000)]
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
Scott Main [Wed, 29 Jan 2014 20:07:13 +0000 (20:07 +0000)]
Merge "add 'get started' link to the bottom of class home pages" into klp-docs
Brian Carlstrom [Wed, 29 Jan 2014 18:05:28 +0000 (18:05 +0000)]
Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
Colin Cross [Wed, 29 Jan 2014 18:01:37 +0000 (10:01 -0800)]
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
Elliott Hughes [Wed, 29 Jan 2014 12:49:08 +0000 (12:49 +0000)]
am
07ada634: am
833188c1: am
e7bd4f5c: am
472a4858: Merge "gtest needs -lpthread."
* commit '
07ada634a1b6aba9d77bf2df07342f25a48a7637':
gtest needs -lpthread.
Brian Carlstrom [Wed, 29 Jan 2014 12:20:59 +0000 (12:20 +0000)]
am
0b0d6277: am
be7575ec: am
cba215dd: am
d21197d5: Merge "Make libart the default runtime"
* commit '
0b0d6277e0b1718265c7aca38bd47611e1199e12':
Make libart the default runtime
Brian Carlstrom [Wed, 29 Jan 2014 07:33:52 +0000 (23:33 -0800)]
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
(cherry picked from commit
c8501bffcb6fa3f552ae424a5701091b5faa6270)
Change-Id: I12ce7c4e383e74e54d77b54a0406d2499699edbf
Brian Carlstrom [Wed, 29 Jan 2014 07:33:52 +0000 (23:33 -0800)]
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
Change-Id: I38d9cb749ec892ba0ba423b0d7c727b27b40b3db
Elliott Hughes [Wed, 29 Jan 2014 01:55:36 +0000 (01:55 +0000)]
am
833188c1: am
e7bd4f5c: am
472a4858: Merge "gtest needs -lpthread."
* commit '
833188c16ea5d2f12aa0108119c327d6cd31d4ea':
gtest needs -lpthread.
Elliott Hughes [Wed, 29 Jan 2014 01:53:14 +0000 (01:53 +0000)]
am
e7bd4f5c: am
472a4858: Merge "gtest needs -lpthread."
* commit '
e7bd4f5cdf5d1ac0c49d42ed41322f10e7f34f9b':
gtest needs -lpthread.
Elliott Hughes [Wed, 29 Jan 2014 01:50:34 +0000 (01:50 +0000)]
am
472a4858: Merge "gtest needs -lpthread."
* commit '
472a48585ec1cfb66c5716f85b0efdf528b29f5d':
gtest needs -lpthread.
Elliott Hughes [Wed, 29 Jan 2014 01:45:17 +0000 (01:45 +0000)]
Merge "gtest needs -lpthread."
Brian Carlstrom [Fri, 17 Jan 2014 01:55:07 +0000 (17:55 -0800)]
Make libart the default runtime
(cherry picked from commit
08d410f53249c18d752f56a881ed2335403080d4)
Change-Id: I4e78a03fcd92e52f34be30726e40af287bb67309
Elliott Hughes [Wed, 29 Jan 2014 01:32:30 +0000 (17:32 -0800)]
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
Brian Carlstrom [Wed, 29 Jan 2014 00:44:02 +0000 (00:44 +0000)]
am
be7575ec: am
cba215dd: am
d21197d5: Merge "Make libart the default runtime"
* commit '
be7575ecb1827784f83582847749aa59c664d29e':
Make libart the default runtime
Brian Carlstrom [Wed, 29 Jan 2014 00:41:31 +0000 (00:41 +0000)]
am
cba215dd: am
d21197d5: Merge "Make libart the default runtime"
* commit '
cba215dd3241ae62416800f8d97d114d8a6e1a9a':
Make libart the default runtime
Brian Carlstrom [Wed, 29 Jan 2014 00:39:45 +0000 (00:39 +0000)]
am
d21197d5: Merge "Make libart the default runtime"
* commit '
d21197d50caaa025bd823a004984a2820bb3c2e2':
Make libart the default runtime
Brian Carlstrom [Wed, 29 Jan 2014 00:32:23 +0000 (00:32 +0000)]
Merge "Make libart the default runtime"
Elliott Hughes [Tue, 28 Jan 2014 21:54:46 +0000 (21:54 +0000)]
am
bc528c22: am
f7784e46: am
1a0e8501: am
1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '
bc528c22b8225e539165f5c86ea0256e57cc7206':
Fix KERNEL_HEADERS_ARCH for mips and x86.
Elliott Hughes [Tue, 28 Jan 2014 21:37:15 +0000 (21:37 +0000)]
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.
Elliott Hughes [Tue, 28 Jan 2014 21:35:25 +0000 (21:35 +0000)]
am
1a0e8501: am
1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '
1a0e850141fe19e1f1d503822893b8d66c0bca69':
Fix KERNEL_HEADERS_ARCH for mips and x86.
Elliott Hughes [Tue, 28 Jan 2014 21:29:52 +0000 (21:29 +0000)]
am
1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '
1a731adf943bc716cc7b9c95b321db02ad7216db':
Fix KERNEL_HEADERS_ARCH for mips and x86.
Elliott Hughes [Tue, 28 Jan 2014 21:23:07 +0000 (21:23 +0000)]
Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
Brian Carlstrom [Tue, 28 Jan 2014 21:10:27 +0000 (13:10 -0800)]
resolved conflicts for merge of
1737b1ab to master
Change-Id: I5a5f2e83c5155c1c783711f736c60198a8f404ee
Elliott Hughes [Tue, 28 Jan 2014 21:07:55 +0000 (13:07 -0800)]
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
Brian Carlstrom [Tue, 28 Jan 2014 20:54:10 +0000 (20:54 +0000)]
am
dc5dd9b4: am
d3737d07: am
49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '
dc5dd9b47fe2a24410b3e70d320655f1b5455966':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
Brian Carlstrom [Tue, 28 Jan 2014 20:52:17 +0000 (20:52 +0000)]
am
d3737d07: am
49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '
d3737d07c8adb0848dcddb7df03d1e6b4378ab93':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
Brian Carlstrom [Tue, 28 Jan 2014 20:50:19 +0000 (20:50 +0000)]
am
49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '
49eb440980db6680ec08c48b416e37e937bf9003':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
Brian Carlstrom [Tue, 28 Jan 2014 20:45:32 +0000 (20:45 +0000)]
Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
Brian Carlstrom [Fri, 17 Jan 2014 07:25:27 +0000 (23:25 -0800)]
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
(cherry-picked from commit
cd337c71ee65b17529a67af34d4c0b2824a4f175)
Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
Brian Carlstrom [Fri, 17 Jan 2014 01:55:07 +0000 (17:55 -0800)]
Make libart the default runtime
Change-Id: I4394f2bdef6f1be36f0f17f3b42d3e62bc2245ef
Colin Cross [Tue, 28 Jan 2014 02:40:00 +0000 (02:40 +0000)]
am
23710e27: am
cb1ad445: am
0d24616d: am
cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '
23710e27bc23bb32dc99f35ec0c31e4185586ec0':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 02:37:21 +0000 (02:37 +0000)]
am
cb1ad445: am
0d24616d: am
cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '
cb1ad445663d190e204330b596b52e4734d9dcf0':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 02:34:05 +0000 (02:34 +0000)]
am
0d24616d: am
cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '
0d24616dd1b29e016aaae86761574fd88d701b6d':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 02:31:18 +0000 (02:31 +0000)]
am
cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '
cdd1475834156b2e45b73ae86a949efa6c1215eb':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 02:25:45 +0000 (02:25 +0000)]
Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
Colin Cross [Tue, 28 Jan 2014 01:34:21 +0000 (17:34 -0800)]
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
Elliott Hughes [Tue, 28 Jan 2014 01:04:55 +0000 (01:04 +0000)]
am
6fe9a949: am
69c36ee7: am
4fbf23ef: am
0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '
6fe9a94989879babb859a24fdef0b2553955cc53':
Remove libthread_db from the default include path.
Elliott Hughes [Tue, 28 Jan 2014 00:59:15 +0000 (00:59 +0000)]
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.
Elliott Hughes [Tue, 28 Jan 2014 00:54:33 +0000 (00:54 +0000)]
am
4fbf23ef: am
0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '
4fbf23ef8267849ce88217a256b394de3904a4f6':
Remove libthread_db from the default include path.
Elliott Hughes [Tue, 28 Jan 2014 00:43:29 +0000 (00:43 +0000)]
am
0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '
0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
Remove libthread_db from the default include path.
Ying Wang [Tue, 28 Jan 2014 00:13:04 +0000 (00:13 +0000)]
am
0064dceb: am
a8d15474: am
04cff708: resolved conflicts for merge of
7382ec7d to klp-dev-plus-aosp
* commit '
0064dceb198788e237bbc10931c54b9a35275976':
ota_from_target_files: Add an option to not sign OTA packages