OSDN Git Service
Colin Cross [Sat, 8 Feb 2014 07:22:46 +0000 (07:22 +0000)]
am
ddd7c919: am
5e9a2033: Merge "don\'t rename 32-bit packages to *_32"
* commit '
ddd7c919d243bb73ce1590463af18c0f0f05c95a':
don't rename 32-bit packages to *_32
Colin Cross [Fri, 7 Feb 2014 07:53:23 +0000 (07:53 +0000)]
am
5e9a2033: Merge "don\'t rename 32-bit packages to *_32"
* commit '
5e9a20337e1110868296c27f201e4579e5e3fb9e':
don't rename 32-bit packages to *_32
Colin Cross [Fri, 7 Feb 2014 05:00:21 +0000 (05:00 +0000)]
Merge "don't rename 32-bit packages to *_32"
Colin Cross [Tue, 4 Feb 2014 19:16:16 +0000 (11:16 -0800)]
don't rename 32-bit packages to *_32
Renaming 32-bit packages to *_32 breaks PRODUCT_PACKAGES dependencies.
Change-Id: I5457c07b64885d77a6bd8fbcbba97d28393c581d
Elliott Hughes [Thu, 6 Feb 2014 21:03:37 +0000 (21:03 +0000)]
am
4d5fa510: am
8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
* commit '
4d5fa510977d8d698ec75d128efc4e71173ae697':
Turn 64-bit-related warnings into errors on 64-bit builds.
Elliott Hughes [Thu, 6 Feb 2014 20:59:33 +0000 (20:59 +0000)]
am
8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
* commit '
8b20d5b97e98ddac6031cb555078f425aef1da8f':
Turn 64-bit-related warnings into errors on 64-bit builds.
Elliott Hughes [Thu, 6 Feb 2014 20:54:04 +0000 (20:54 +0000)]
Merge "Turn 64-bit-related warnings into errors on 64-bit builds."
Elliott Hughes [Thu, 6 Feb 2014 20:29:48 +0000 (20:29 +0000)]
am
3f040869: am
efb9603a: Merge "[MIPS64] Add mips64 target"
* commit '
3f0408695b23a8d21c3227ae845006381b26f666':
[MIPS64] Add mips64 target
Elliott Hughes [Thu, 6 Feb 2014 20:21:41 +0000 (20:21 +0000)]
am
efb9603a: Merge "[MIPS64] Add mips64 target"
* commit '
efb9603aeb5ac71e23fa2a3ade6aa4fc2efdeb5e':
[MIPS64] Add mips64 target
Elliott Hughes [Thu, 6 Feb 2014 20:14:55 +0000 (20:14 +0000)]
Merge "[MIPS64] Add mips64 target"
Ying Wang [Thu, 6 Feb 2014 18:11:51 +0000 (18:11 +0000)]
am
69c3f457: am
dc7fee9f: Set up rules to merge AndroidManifest.xmls
* commit '
69c3f4570d80eab99bfcab604209dc7bb3ae5537':
Set up rules to merge AndroidManifest.xmls
Ying Wang [Thu, 6 Feb 2014 18:07:51 +0000 (18:07 +0000)]
am
dc7fee9f: Set up rules to merge AndroidManifest.xmls
* commit '
dc7fee9fbf46ac06c840c7edfd51fbefeece63e4':
Set up rules to merge AndroidManifest.xmls
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
Chris Dearman [Mon, 3 Feb 2014 23:01:24 +0000 (15:01 -0800)]
[MIPS64] Add mips64 target
Change-Id: Ice1621101c0d5a3314db288542ca8020e3f406bf
Signed-off-by: Duane Sand <duane.sand@imgtec.com>
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.
Ying Wang [Thu, 6 Feb 2014 02:24:45 +0000 (18:24 -0800)]
Set up rules to merge AndroidManifest.xmls
Now you can merge the library manifest files to the main app's
AndroidManifest.xml with LOCAL_FULL_LIBS_MANIFEST_FILES.
LOCAL_FULL_LIBS_MANIFEST_FILES is a list of paths relative to the top of
the source tree.
Bug:
12907528
Change-Id: I16a347c83dfb6fbbb7d5d40284b7c65aa682fdd2
Christopher Ferris [Thu, 6 Feb 2014 02:16:35 +0000 (02:16 +0000)]
Merge "Add library test makefile solutions."
Elliott Hughes [Thu, 6 Feb 2014 00:23:47 +0000 (16:23 -0800)]
Turn 64-bit-related warnings into errors on 64-bit builds.
I don't think we can realistically turn this on for 32-bit builds any
time soon.
Also, fix the arm64 stack-protector hack.
Change-Id: Ie1e7c875bbc06fb21bb372b8ca99879a23ef53d4
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."
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
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
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
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
Serban Constantinescu [Tue, 14 Jan 2014 10:33:53 +0000 (10:33 +0000)]
Add 64-bit gdbclients.
This patch adds gdbclient combo for arm64, mips64, and x86_64.
Change-Id: I659b662276c93e5cce92aadc203a4bc111f5c2af
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
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