OSDN Git Service
Andreas Huber [Fri, 21 Feb 2014 18:34:43 +0000 (10:34 -0800)]
am
a42d3a48: fix the build, libstagefright_chromium_http is no longer needed.
* commit '
a42d3a4865785f75da449f6dc28f7d9054ea2418':
fix the build, libstagefright_chromium_http is no longer needed.
Christopher Ferris [Fri, 21 Feb 2014 18:34:42 +0000 (10:34 -0800)]
am
5d8ee715: am
6d0899ea: am
afbbce3f: Merge "Add library test makefile solutions."
* commit '
5d8ee7150668cf3c0c034ff42d1a8f43cca7aa8b':
Add library test makefile solutions.
Colin Cross [Fri, 21 Feb 2014 18:34:41 +0000 (10:34 -0800)]
am
98255dc9: am
d69ed2e2: am
054b0274: Merge topic \'arm64\'
* commit '
98255dc988ad51bb900ff5cd2571071e120d0080':
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
Colin Cross [Fri, 21 Feb 2014 18:34:41 +0000 (10:34 -0800)]
am
96870b3e: am
dc5249ab: am
717de0f5: Merge "Fix installing 2nd arch shared libraries"
* commit '
96870b3eb448fe4817b6ad9a12b409b318d58d2e':
Fix installing 2nd arch shared libraries
Ying Wang [Fri, 21 Feb 2014 18:34:40 +0000 (10:34 -0800)]
Ying Wang [Fri, 21 Feb 2014 18:34:39 +0000 (10:34 -0800)]
am
d89ffa86: Fix emulator builds
* commit '
d89ffa8623b750f85cbb8be01aba9fa4a9448180':
Fix emulator builds
Adam Lesinski [Fri, 21 Feb 2014 18:34:38 +0000 (10:34 -0800)]
am
9cee77b3: am
bebb2b54: am
7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
* commit '
9cee77b3704eaeee30b724590fe62ad5a8305339':
Allow multiple asset directories in aapt
Justin Koh [Fri, 21 Feb 2014 18:34:38 +0000 (10:34 -0800)]
am
19753f45: am
bbfebfad: resolved conflicts for merge of
303d2755 to klp-modular-dev-plus-aosp
* commit '
19753f458bc5ec546f4c5bb304072a53b4f9357f':
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
Doug Zongker [Fri, 21 Feb 2014 18:34:37 +0000 (10:34 -0800)]
am
01ce19c9: make full OTAs block based
* commit '
01ce19c95f358ac8ef9bb939d2637ac976320401':
make full OTAs block based
Doug Zongker [Fri, 21 Feb 2014 18:34:36 +0000 (10:34 -0800)]
am
c9253822: add recovery update code to system images
* commit '
c9253822ea31c1d35d3fc2b495b45b476c240a1d':
add recovery update code to system images
Tim Murray [Fri, 21 Feb 2014 18:34:36 +0000 (10:34 -0800)]
am
e858190f: am
47f9b9bc: am
5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."
* commit '
e858190fc4bb0f7390efa232c963e8669adac4c8':
Add new rs directory to list of Java subdirs of fw/base.
Ying Wang [Fri, 21 Feb 2014 18:34:35 +0000 (10:34 -0800)]
am
8647c336: am
1446cf93: am
a77456b8: Merge "Dedup the targets and dependencies of required modules."
* commit '
8647c3366f6c6679aab1a3a1073392a9f6794335':
Dedup the targets and dependencies of required modules.
Ying Wang [Fri, 21 Feb 2014 18:34:34 +0000 (10:34 -0800)]
am
fc330375: Dedup the targets and dependencies of required modules.
* commit '
fc33037547495aa21b25216d360b27a7100e2a42':
Dedup the targets and dependencies of required modules.
Noreen Tolland [Fri, 21 Feb 2014 18:34:33 +0000 (10:34 -0800)]
am
d76bb175: am
4b69be27: (-s ours) am
c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
* commit '
d76bb1755d843f90525a22c191938037cf87a7a1':
(DO NOT MERGE) Revert "Make libart the default runtime"
Ben Cheng [Fri, 21 Feb 2014 18:34:33 +0000 (10:34 -0800)]
am
bc80daff: am
09c9881f: am
5608a8c6: Merge "Add 64-bit gdbclients."
* commit '
bc80daffee89269c491680ceb0ba29f84dd0fab0':
Add 64-bit gdbclients.
Brian Carlstrom [Fri, 21 Feb 2014 18:34:32 +0000 (10:34 -0800)]
am
7468e276: am
03c16a30: am
aae47044: Merge "CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
7468e2767695c2736f4e1095e1f3579651ba4974':
CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Fri, 21 Feb 2014 18:34:31 +0000 (10:34 -0800)]
am
5b40a0bd: am
a15fc8fd: am
601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
5b40a0bd02d270b03fd8ac6d76ad8e2d53db84ea':
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
Andreas Huber [Thu, 6 Feb 2014 17:28:00 +0000 (09:28 -0800)]
fix the build, libstagefright_chromium_http is no longer needed.
Change-Id: I1777b3e9157a4bdb868b9e14cc62422b1e017c5d
Christopher Ferris [Thu, 6 Feb 2014 03:07:49 +0000 (03:07 +0000)]
am
6d0899ea: am
afbbce3f: Merge "Add library test makefile solutions."
* commit '
6d0899ea4735293cca61661366dd98917f200bb3':
Add library test makefile solutions.
Christopher Ferris [Thu, 6 Feb 2014 02:59:39 +0000 (02:59 +0000)]
am
afbbce3f: Merge "Add library test makefile solutions."
* commit '
afbbce3ff1d2d94e54f48d748d18796ce671fce9':
Add library test makefile solutions.
Christopher Ferris [Thu, 6 Feb 2014 02:16:35 +0000 (02:16 +0000)]
Merge "Add library test makefile solutions."
Christopher Ferris [Wed, 5 Feb 2014 06:09:16 +0000 (22:09 -0800)]
Add library test makefile solutions.
Change-Id: Ibc8df9b0e2342683158936bf011425780df8f02a
Colin Cross [Thu, 6 Feb 2014 00:06:30 +0000 (00:06 +0000)]
am
d69ed2e2: am
054b0274: Merge topic \'arm64\'
* commit '
d69ed2e25c59803bbbbbee7c09551efb3ed0c49d':
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
Colin Cross [Thu, 6 Feb 2014 00:06:30 +0000 (00:06 +0000)]
am
dc5249ab: am
717de0f5: Merge "Fix installing 2nd arch shared libraries"
* commit '
dc5249ab3c82040e21269fb69dc9a6dc89224629':
Fix installing 2nd arch shared libraries
Colin Cross [Thu, 6 Feb 2014 00:01:38 +0000 (00:01 +0000)]
am
054b0274: Merge topic \'arm64\'
* commit '
054b0274fc27babb42a60002ad25c9e608eac257':
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
Colin Cross [Thu, 6 Feb 2014 00:01:37 +0000 (00:01 +0000)]
am
717de0f5: Merge "Fix installing 2nd arch shared libraries"
* commit '
717de0f553dc3c1a2baa0cc988af1adc5b26dba8':
Fix installing 2nd arch shared libraries
Colin Cross [Wed, 5 Feb 2014 23:57:08 +0000 (23:57 +0000)]
Merge topic 'arm64'
* changes:
add support for more LOCAL_*_arch variables
don't rename 32-bit executables to *_32
remove 2nd arch from ARCH_ARM_* defines
Colin Cross [Wed, 5 Feb 2014 23:55:54 +0000 (23:55 +0000)]
Merge "Fix installing 2nd arch shared libraries"
Ying Wang [Wed, 5 Feb 2014 20:15:06 +0000 (12:15 -0800)]
Fix typo.
Change-Id: I01a1762fe449e02ff80a5ea7a3ee1c529e5da902
Ying Wang [Wed, 5 Feb 2014 19:28:51 +0000 (11:28 -0800)]
Fix emulator builds
which don't have boot.img.
Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
Colin Cross [Tue, 4 Feb 2014 22:53:25 +0000 (14:53 -0800)]
add support for more LOCAL_*_arch variables
Add support for:
LOCAL_SHARED_LIBRARIES_arch
LOCAL_STATIC_LIBRARIES_arch
LOCAL_WHOLE_STATIC_LIBRARIES_arch
LOCAL_GENERATED_SOURCES_arch
LOCAL_REQUIRED_MODULES_arch
Change-Id: Iad91702e140d8dba7dcaee13f236c77b1e626a34
Colin Cross [Wed, 5 Feb 2014 03:42:32 +0000 (19:42 -0800)]
Fix installing 2nd arch shared libraries
2ND_TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES was not set,
which was causing the later += to act like = instead of
:=, and the dependencies would disappear as soon as
LOCAL_MODULE was cleared.
Change-Id: Idea291524fc06377deafec62f37d20eaa7f93bca
Colin Cross [Tue, 4 Feb 2014 19:16:16 +0000 (11:16 -0800)]
don't rename 32-bit executables to *_32
Renaming 32-bit executables to *_32 breaks PRODUCT_PACKAGES
dependencies.
Change-Id: I53d89991633ef4af03c4e618c463769937a70e38
Colin Cross [Tue, 4 Feb 2014 19:15:26 +0000 (11:15 -0800)]
remove 2nd arch from ARCH_ARM_* defines
Users of ARCH_ARM_* defines don't care about first vs. second arch,
set ARCH_ARM_* regardless of which arch is arm.
Change-Id: I2ae83ec5c3f839ff91a0e352c95d76ec2cbd5dc5
Adam Lesinski [Wed, 5 Feb 2014 00:56:13 +0000 (00:56 +0000)]
am
bebb2b54: am
7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
* commit '
bebb2b54cee7a0fbf9419f6cc8659a8b16a37bd0':
Allow multiple asset directories in aapt
Adam Lesinski [Wed, 5 Feb 2014 00:49:37 +0000 (00:49 +0000)]
am
7b734fd8: Merge "Allow multiple asset directories in aapt" into klp-modular-dev
* commit '
7b734fd8d163f7a71254b909fbbcd358129924b7':
Allow multiple asset directories in aapt
Adam Lesinski [Wed, 5 Feb 2014 00:46:59 +0000 (00:46 +0000)]
Merge "Allow multiple asset directories in aapt" into klp-modular-dev
Adam Lesinski [Tue, 28 Jan 2014 00:08:28 +0000 (16:08 -0800)]
Allow multiple asset directories in aapt
AAPT already supports this.
Change-Id: I293c7543fb43b15eedf2162416da48915ce02db8
Justin Koh [Tue, 4 Feb 2014 23:42:07 +0000 (23:42 +0000)]
am
bbfebfad: resolved conflicts for merge of
303d2755 to klp-modular-dev-plus-aosp
* commit '
bbfebfad0d8ad002995bb1005b61a35b42a8ce35':
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
Justin Koh [Tue, 4 Feb 2014 23:16:15 +0000 (15:16 -0800)]
resolved conflicts for merge of
303d2755 to klp-modular-dev-plus-aosp
Change-Id: I653cac50cf71b75d47974dde833468fa61024ae9
Doug Zongker [Tue, 4 Feb 2014 21:48:15 +0000 (13:48 -0800)]
make full OTAs block based
Instead of writing individual files and fixing up their metadata, make
full OTAs contain a system image and simply write it to the block
device.
This is only done for target-files that already contain the recovery
flashing information, older target-files still get a file-based full
OTA.
Bug:
12893978
Change-Id: If7586083c8f275e24fec49d260af5b5aff4a0a88
Doug Zongker [Tue, 4 Feb 2014 20:17:58 +0000 (12:17 -0800)]
add recovery update code to system images
Currently, the "img" zip files generated by the build system lack the
script and data needed to rewrite the recovery partition, while the
"ota" zip files do (when installed).
In order to move towards block-based OTAs, we want the result of
flashing an image and the result of installing the corresponding OTA
package to be identical.
Generate the recovery-from-boot patch and install script as part of
the process of building the target-files. This requires breaking the
code to generate that out of ota_from_target_files into its own tool
that we can run from the Makefile. (ota_from_target_files can still
do this, so it continues to work with older target-files.)
Bug:
12893978
Change-Id: I80e62268840780b81216e548be89b47baf81b4ac
Justin Koh [Tue, 4 Feb 2014 00:26:43 +0000 (16:26 -0800)]
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.
Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
Tim Murray [Mon, 3 Feb 2014 22:55:09 +0000 (22:55 +0000)]
am
47f9b9bc: am
5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."
* commit '
47f9b9bc290dae448f07101c1fb6629285973514':
Add new rs directory to list of Java subdirs of fw/base.
Tim Murray [Mon, 3 Feb 2014 22:44:31 +0000 (22:44 +0000)]
am
5352018b: Merge "Add new rs directory to list of Java subdirs of fw/base."
* commit '
5352018b0b115061bce7a2aac14780ffea3885c7':
Add new rs directory to list of Java subdirs of fw/base.
Tim Murray [Mon, 3 Feb 2014 22:35:54 +0000 (22:35 +0000)]
Merge "Add new rs directory to list of Java subdirs of fw/base."
Ed Heyl [Mon, 3 Feb 2014 17:47:42 +0000 (09:47 -0800)]
merge
601d39b688bcbb1789e145d1b72753206c24d374
Change-Id: I9795ab63b29481de392a8672d272082270894e1f
Ying Wang [Mon, 3 Feb 2014 17:00:02 +0000 (17:00 +0000)]
am
1446cf93: am
a77456b8: Merge "Dedup the targets and dependencies of required modules."
* commit '
1446cf93ede1e36f40073023e57f1ba849a72079':
Dedup the targets and dependencies of required modules.
Ying Wang [Mon, 3 Feb 2014 00:45:03 +0000 (00:45 +0000)]
am
a77456b8: Merge "Dedup the targets and dependencies of required modules."
* commit '
a77456b8e8a5e66705e48e1ec4eebc1889553c6a':
Dedup the targets and dependencies of required modules.
Ying Wang [Sat, 1 Feb 2014 03:22:35 +0000 (19:22 -0800)]
Dedup the targets and dependencies of required modules.
For whatever reason, two modules may have the same file as their
installed module. In that case circular dependency is created if the two
modules have requited-by relation.
Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
Ying Wang [Sat, 1 Feb 2014 03:25:47 +0000 (03:25 +0000)]
Merge "Dedup the targets and dependencies of required modules."
Ying Wang [Sat, 1 Feb 2014 03:22:35 +0000 (19:22 -0800)]
Dedup the targets and dependencies of required modules.
For whatever reason, two modules may have the same file as their
installed module. In that case circular dependency is created if the two
modules have requited-by relation.
Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
Noreen Tolland [Fri, 31 Jan 2014 23:24:15 +0000 (23:24 +0000)]
am
4b69be27: (-s ours) am
c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
* commit '
4b69be271c58981eccde155bbfd5ccababc19024':
(DO NOT MERGE) Revert "Make libart the default runtime"
Noreen Tolland [Fri, 31 Jan 2014 23:17:33 +0000 (23:17 +0000)]
am
c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
* commit '
c816e061270327d3e2b73ae3c848e1fefc6ec6ef':
(DO NOT MERGE) Revert "Make libart the default runtime"
Noreen Tolland [Fri, 31 Jan 2014 23:13:24 +0000 (23:13 +0000)]
Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
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.
Tim Murray [Tue, 17 Dec 2013 21:27:28 +0000 (13:27 -0800)]
Add new rs directory to list of Java subdirs of fw/base.
Change-Id: I3213a314e7700162e781526c0450678495442759
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
Ben Cheng [Fri, 31 Jan 2014 16:41:30 +0000 (16:41 +0000)]
am
09c9881f: am
5608a8c6: Merge "Add 64-bit gdbclients."
* commit '
09c9881f10fdb44accc682f8d485fab102f617aa':
Add 64-bit gdbclients.
Brian Carlstrom [Fri, 31 Jan 2014 16:41:29 +0000 (16:41 +0000)]
am
03c16a30: am
aae47044: Merge "CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
03c16a309951c713ab4ab75434c9305134d72e14':
CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Fri, 31 Jan 2014 16:41:28 +0000 (16:41 +0000)]
am
a15fc8fd: am
601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
a15fc8fd1aad30631b7605f3120bdee3b8cf2ba4':
build: Rename persist.sys.dalvik.vm.lib to allow new 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
Ben Cheng [Fri, 31 Jan 2014 12:34:18 +0000 (12:34 +0000)]
am
5608a8c6: Merge "Add 64-bit gdbclients."
* commit '
5608a8c6e86381cdabc46c3a9b90564411771796':
Add 64-bit gdbclients.
Brian Carlstrom [Fri, 31 Jan 2014 12:34:18 +0000 (12:34 +0000)]
am
aae47044: Merge "CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
aae470446504a869db05f9b70b7146ea47d746d5':
CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Fri, 31 Jan 2014 12:34:17 +0000 (12:34 +0000)]
am
601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
601d39b688bcbb1789e145d1b72753206c24d374':
build: Rename persist.sys.dalvik.vm.lib to allow new default
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
Justin Mattson [Thu, 30 Jan 2014 23:30:08 +0000 (15:30 -0800)]
(DO NOT MERGE) Revert "Make libart the default runtime"
This reverts commit
08d410f53249c18d752f56a881ed2335403080d4.
Ben Cheng [Thu, 30 Jan 2014 22:01:32 +0000 (22:01 +0000)]
Merge "Add 64-bit gdbclients."
Brian Carlstrom [Thu, 30 Jan 2014 22:00:33 +0000 (22:00 +0000)]
Merge "CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:56:51 +0000 (13:56 -0800)]
CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
Change-Id: I3ed55460864c17a199053a058b2482c6c4579622