OSDN Git Service
Elliott Hughes [Wed, 5 Jun 2013 21:11:03 +0000 (14:11 -0700)]
am
1da7fec6: Merge "Fix minor leaks caused by failed initialization in JNI_CreateJavaVM"
* commit '
1da7fec6c97623822c159ed7a8bbcce89db63119':
Fix minor leaks caused by failed initialization in JNI_CreateJavaVM
Elliott Hughes [Wed, 5 Jun 2013 21:09:03 +0000 (21:09 +0000)]
Merge "Fix minor leaks caused by failed initialization in JNI_CreateJavaVM"
Elliott Hughes [Wed, 5 Jun 2013 21:04:35 +0000 (14:04 -0700)]
am
f6944312: Merge "Fix a minor bug in dvmCreateInterpThread"
* commit '
f694431279501527cc3271d50b619533000dbd8f':
Fix a minor bug in dvmCreateInterpThread
Elliott Hughes [Wed, 5 Jun 2013 21:02:50 +0000 (21:02 +0000)]
Merge "Fix a minor bug in dvmCreateInterpThread"
Elliott Hughes [Wed, 5 Jun 2013 20:32:48 +0000 (13:32 -0700)]
am
91027c67: Merge "Remove unused compiler templates for armv7-a*"
* commit '
91027c67a3924429bc6fc94a7f28893d9d09c900':
Remove unused compiler templates for armv7-a*
Elliott Hughes [Wed, 5 Jun 2013 20:30:48 +0000 (20:30 +0000)]
Merge "Remove unused compiler templates for armv7-a*"
Elliott Hughes [Wed, 5 Jun 2013 20:23:28 +0000 (13:23 -0700)]
am
f3079bda: Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
* commit '
f3079bdadf30d93b37e0a59a8787c636027a36f5':
Rename unreasonable function name dmvCompilerTemplateEnd
Elliott Hughes [Wed, 5 Jun 2013 20:22:09 +0000 (20:22 +0000)]
Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
Yanchuan Nian [Tue, 21 May 2013 02:41:51 +0000 (10:41 +0800)]
Rename unreasonable function name dmvCompilerTemplateEnd
In dalvik, most function names start with "dvm" except dmvCompilerTemplateEnd.
Convert it to dvmCompilerTemplateEnd in order to follow the rule.
Change-Id: I09c41f8c9d55058013fbdb62ac5922ccd067ce39
Brian Carlstrom [Wed, 22 May 2013 19:30:32 +0000 (12:30 -0700)]
am
8eac07c9: Merge "Move jdwpspy from development to dalvik (2 of 2)"
* commit '
8eac07c961fbdb745a36cb182d58ac83ad5ba819':
Move jdwpspy from development to dalvik (2 of 2)
Brian Carlstrom [Wed, 22 May 2013 19:22:14 +0000 (19:22 +0000)]
Merge "Move jdwpspy from development to dalvik (2 of 2)"
Brian Carlstrom [Wed, 22 May 2013 04:07:08 +0000 (21:07 -0700)]
Move jdwpspy from development to dalvik (2 of 2)
Change-Id: I3e7a255fddcec1380fce143004cbad83a69d2c0d
Jean-Philippe Lesot [Fri, 17 May 2013 07:38:04 +0000 (00:38 -0700)]
am
97208a0b: Merge "Added support for version 51 class files in dx"
* commit '
97208a0be35a4b9583172dc853150a32bb138f15':
Added support for version 51 class files in dx
Jean-Philippe Lesot [Fri, 17 May 2013 07:38:03 +0000 (00:38 -0700)]
am
467f7e3a: Merge "Report problems as errors in dx (with exit codes)"
* commit '
467f7e3aaf8aafe324744bfd825fe9941862b7b7':
Report problems as errors in dx (with exit codes)
Jean-Philippe Lesot [Fri, 17 May 2013 07:26:19 +0000 (07:26 +0000)]
Merge "Added support for version 51 class files in dx"
Jean-Philippe Lesot [Fri, 17 May 2013 07:25:05 +0000 (07:25 +0000)]
Merge "Report problems as errors in dx (with exit codes)"
You Kim [Thu, 16 May 2013 17:43:09 +0000 (02:43 +0900)]
Remove unused compiler templates for armv7-a*
Change-Id: I68e344c2f2689347d6eeb943030b7263a55cd0bd
The Android Open Source Project [Thu, 16 May 2013 12:43:00 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia4ccbf9977ed38b3283b26b2c7f889d942eebde6
delphinemartin [Fri, 26 Apr 2013 15:46:50 +0000 (17:46 +0200)]
Report problems as errors in dx (with exit codes)
(cherry picked from commit
593a7233e13d6eeb8ae5d894e29c6a27cbc7b7f0)
Change-Id: I6421f95ceb97a596a19781e46cb4767bfb21cdbd
delphinemartin [Mon, 29 Apr 2013 12:04:47 +0000 (14:04 +0200)]
Added support for version 51 class files in dx
If an invokedynamic is present, an exception is thrown.
(cherry picked from commit
94629f2a31206637fc79535ffef1b223e9f02e30)
Change-Id: I1922d4cf78465dfd2ac53f8694b7317a1d98016d
Elliott Hughes [Mon, 13 May 2013 19:04:04 +0000 (12:04 -0700)]
am
9275963e: Merge "Move verification of class access flags to libdex"
* commit '
9275963e79d1625120db610b78c3a0812ebb2922':
Move verification of class access flags to libdex
Elliott Hughes [Mon, 13 May 2013 18:50:41 +0000 (18:50 +0000)]
Merge "Move verification of class access flags to libdex"
Brian Carlstrom [Fri, 10 May 2013 14:34:18 +0000 (07:34 -0700)]
am
130eebad: Merge "Adapt dalvik to new libnativehelper"
* commit '
130eebad44c24874fb940884bfd8d9cde58dc367':
Adapt dalvik to new libnativehelper
Brian Carlstrom [Fri, 10 May 2013 14:17:33 +0000 (14:17 +0000)]
Merge "Adapt dalvik to new libnativehelper"
Brian Carlstrom [Fri, 10 May 2013 02:02:38 +0000 (19:02 -0700)]
Adapt dalvik to new libnativehelper
Change-Id: Id4707ea30c77d3760f1224fd9063c8c3f87c1ea7
Ben Gruver [Wed, 8 May 2013 20:29:36 +0000 (13:29 -0700)]
Move verification of class access flags to libdex
Change-Id: I020a168cfff46e319b0bebb6c7477f0b4139c6de
Elliott Hughes [Wed, 8 May 2013 20:26:09 +0000 (13:26 -0700)]
am
fd6ac490: Merge "Reject dex files that attempt to use unspecified class access flags"
* commit '
fd6ac49042522cbed5db0c097114a62b5201f6af':
Reject dex files that attempt to use unspecified class access flags
Elliott Hughes [Wed, 8 May 2013 18:33:58 +0000 (18:33 +0000)]
Merge "Reject dex files that attempt to use unspecified class access flags"
The Android Automerger [Wed, 8 May 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jamie Gennis [Wed, 8 May 2013 01:26:50 +0000 (18:26 -0700)]
am
858dfecf: Merge "Add systrace tracing for GC and thread suspension." into jb-mr2-dev
* commit '
858dfecf6db216e3a9ff30b6a38a8e1bf6da6733':
Add systrace tracing for GC and thread suspension.
Jamie Gennis [Wed, 8 May 2013 01:24:29 +0000 (01:24 +0000)]
Merge "Add systrace tracing for GC and thread suspension." into jb-mr2-dev
Jamie Gennis [Tue, 7 May 2013 22:37:01 +0000 (15:37 -0700)]
Add systrace tracing for GC and thread suspension.
Bug:
8856374
Change-Id: I58420a14fb52eab6295381a4d8f2d59eacfe0473
Dima Zavin [Tue, 7 May 2013 08:00:20 +0000 (01:00 -0700)]
am
3b5c07d6: Merge "vm: vmruntime: remove obsolete dependency on array.h"
* commit '
3b5c07d649a15b77094d48acba07f0d8b2a366ce':
vm: vmruntime: remove obsolete dependency on array.h
Dima Zavin [Tue, 7 May 2013 07:49:03 +0000 (07:49 +0000)]
Merge "vm: vmruntime: remove obsolete dependency on array.h"
Dima Zavin [Tue, 7 May 2013 05:53:09 +0000 (22:53 -0700)]
vm: vmruntime: remove obsolete dependency on array.h
Change-Id: Ib1a0143752e701bf2f1e0b7edb4ea7829aa4edc3
Signed-off-by: Dima Zavin <dima@android.com>
Ben Gruver [Mon, 6 May 2013 17:47:25 +0000 (10:47 -0700)]
Reject dex files that attempt to use unspecified class access flags
Change-Id: Ib1ecf3dfe1856a9014c2e9b0d6a1725ba7617f98
The Android Automerger [Mon, 6 May 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Brian Carlstrom [Sat, 4 May 2013 21:19:56 +0000 (14:19 -0700)]
am
ac653462: Merge "Fix alignment when recompacting a DexMerger result."
* commit '
ac653462268d0ec88c9c3979bd8c66a23549a7d2':
Fix alignment when recompacting a DexMerger result.
Brian Carlstrom [Sat, 4 May 2013 21:11:38 +0000 (21:11 +0000)]
Merge "Fix alignment when recompacting a DexMerger result."
yroussel [Wed, 31 Oct 2012 15:25:42 +0000 (16:25 +0100)]
Fix alignment when recompacting a DexMerger result.
(cherry picked from commit
a659fe6f8a0b7d32eafc9a2ff7aa1387702da053)
Change-Id: I7c93e7d45b52655cd7adfdc3fc783757ee71079b
Brian Carlstrom [Sat, 4 May 2013 18:23:11 +0000 (11:23 -0700)]
am
647260b2: Merge "Use zero filled alignment padding before method code"
* commit '
647260b2efc139871d70bb9d25238d69615356f9':
Use zero filled alignment padding before method code
Brian Carlstrom [Sat, 4 May 2013 18:04:01 +0000 (18:04 +0000)]
Merge "Use zero filled alignment padding before method code"
Jesse Wilson [Thu, 22 Sep 2011 18:19:20 +0000 (14:19 -0400)]
Use zero filled alignment padding before method code
(cherry picked from commit
d8760772c49647ab197c34b8e46438c410decb42)
Change-Id: I092ff646b02abf7b3ee6285361e4e256c1ade37d
Brian Carlstrom [Sat, 4 May 2013 01:22:59 +0000 (18:22 -0700)]
am
1d6aa9e2: Merge "Allow the merging of more than 2 dex file at a time."
* commit '
1d6aa9e267ea8f0705b857d70fbf6c2082ce5db3':
Allow the merging of more than 2 dex file at a time.
Brian Carlstrom [Sat, 4 May 2013 01:08:34 +0000 (18:08 -0700)]
am
d1d01989: Merge "Fix bug on register compatibility."
* commit '
d1d0198958d140ee2069e6d9d5130824b27bd451':
Fix bug on register compatibility.
Brian Carlstrom [Sat, 4 May 2013 01:08:33 +0000 (18:08 -0700)]
am
f7e2a548: Merge "Remove duplicate LOCAL_MODULE_TAGS"
* commit '
f7e2a54823232a9cc249f799e666547fac0ab27d':
Remove duplicate LOCAL_MODULE_TAGS
Brian Carlstrom [Sat, 4 May 2013 01:04:46 +0000 (01:04 +0000)]
Merge "Allow the merging of more than 2 dex file at a time."
yroussel [Fri, 26 Oct 2012 13:24:56 +0000 (15:24 +0200)]
Allow the merging of more than 2 dex file at a time.
(cherry picked from commit
f9f7020a0a181ffba3bb9ed123f5bb211a61738e)
Change-Id: I2dd875399c2d30d214b6a025ffea995155ff48c1
Brian Carlstrom [Sat, 4 May 2013 01:01:46 +0000 (01:01 +0000)]
Merge "Fix bug on register compatibility."
mikaelpeltier [Mon, 8 Oct 2012 12:46:07 +0000 (14:46 +0200)]
Fix bug on register compatibility.
- Bad register usage to compute prefix or suffix expansion.
(cherry picked from commit
5bce02865087b7ec3c6321a1bef9542c18b0f90e)
Change-Id: Ife9b2b07870bbc933f959c194a4a72dfa9507cfb
Brian Carlstrom [Sat, 4 May 2013 00:54:40 +0000 (00:54 +0000)]
Merge "Remove duplicate LOCAL_MODULE_TAGS"
Brian Carlstrom [Sat, 4 May 2013 00:53:01 +0000 (17:53 -0700)]
am
ee48f542: Merge "Fix bad whitespace alignment from LOGW to ALOGW change"
* commit '
ee48f5425c14da39e498f08b9529025fa96d62fb':
Fix bad whitespace alignment from LOGW to ALOGW change
Brian Carlstrom [Sat, 4 May 2013 00:51:51 +0000 (17:51 -0700)]
Remove duplicate LOCAL_MODULE_TAGS
Change-Id: Ib2076dedc066dab0f71b038d84edd6b60565c211
Brian Carlstrom [Sat, 4 May 2013 00:50:05 +0000 (17:50 -0700)]
resolved conflicts for merge of
c7f23a58 to jb-mr2-dev-plus-aosp
Change-Id: Ic1ff892898884326151d02a53c15f5bb4bb57c28
Brian Carlstrom [Sat, 4 May 2013 00:35:02 +0000 (00:35 +0000)]
Merge "Fix bad whitespace alignment from LOGW to ALOGW change"
Brian Carlstrom [Sat, 4 May 2013 00:31:16 +0000 (17:31 -0700)]
Fix bad whitespace alignment from LOGW to ALOGW change
Change-Id: I8eba74b92976f433aff42e6c4461e3127e519d77
Brian Carlstrom [Sat, 4 May 2013 00:20:51 +0000 (00:20 +0000)]
Merge "Remove dx's copy of JUnit. (part II)"
Jesse Wilson [Fri, 9 Dec 2011 19:33:21 +0000 (14:33 -0500)]
Remove dx's copy of JUnit. (part II)
This is a second attempt to cherry-pick
4cd7b39876bcec03bb1d0c2afa61cbdb7d119eba
because a couple things didn't come through last time.
Change-Id: I12e5340f0504c1d875d3e4bbe23d8d5506f72fe6
Brian Carlstrom [Fri, 3 May 2013 23:10:13 +0000 (16:10 -0700)]
am
34e2dd66: Merge "Define scripts for calling DexMerger."
* commit '
34e2dd664631a974fbf92d0ad291e22d332f84cb':
Define scripts for calling DexMerger.
Brian Carlstrom [Fri, 3 May 2013 22:57:41 +0000 (22:57 +0000)]
Merge "Define scripts for calling DexMerger."
Brian Carlstrom [Fri, 3 May 2013 22:53:35 +0000 (15:53 -0700)]
am
69fcce64: Merge "Print proto_ids_{size,off} along with the rest of the header."
* commit '
69fcce644574d25339a71cfe2c9821bbfaf8b731':
Print proto_ids_{size,off} along with the rest of the header.
yroussel [Fri, 26 Oct 2012 14:33:53 +0000 (16:33 +0200)]
Define scripts for calling DexMerger.
(cherry picked from commit
4f00f32e39f04b5b7ba6684ee3914d9904a139d5)
Change-Id: I86cedb9f48bbb8f7f1945f86b9e10bc2f37a24b9
Brian Carlstrom [Fri, 3 May 2013 22:37:17 +0000 (22:37 +0000)]
Merge "Print proto_ids_{size,off} along with the rest of the header."
Brian Carlstrom [Fri, 3 May 2013 22:35:55 +0000 (15:35 -0700)]
am
1f7ec2be: Merge "Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES"
* commit '
1f7ec2be2473a0becba97d2d12ccc992b993f7b7':
Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES
Carl Shapiro [Thu, 4 Aug 2011 02:38:17 +0000 (19:38 -0700)]
Print proto_ids_{size,off} along with the rest of the header.
(cherry picked from commit
6e5f79ce9af380d12238a4ed958cdb56e5490ced)
Change-Id: Ie1df9e0f23d8f5fcea4b6ed7487c61a8182e1a65
Brian Carlstrom [Fri, 3 May 2013 22:30:15 +0000 (22:30 +0000)]
Merge "Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES"
Brian Carlstrom [Fri, 3 May 2013 22:23:47 +0000 (15:23 -0700)]
Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES
Change-Id: I463a62898e5dd8eb01d1dfbaf71f67d8e1b4e67c
Elliott Hughes [Fri, 3 May 2013 20:39:53 +0000 (13:39 -0700)]
Revert "Revert "Tiny optimization for complier templates for arm.""
This reverts commit
4afb260cf1f312382541e30cab5766bff890e6fe.
Elliott Hughes [Fri, 3 May 2013 19:17:50 +0000 (12:17 -0700)]
am
0bc4a058: Merge "Fix dalvik tests post-conscrypt."
* commit '
0bc4a05819575824bde922e713146337f7cb5eec':
Fix dalvik tests post-conscrypt.
Elliott Hughes [Fri, 3 May 2013 19:17:49 +0000 (12:17 -0700)]
am
0d5f6f6e: Merge "Fix some leaks in VfyBasicBlock & BitVector."
* commit '
0d5f6f6e7099f737cbc28611d9a96218d0149e05':
Fix some leaks in VfyBasicBlock & BitVector.
Elliott Hughes [Fri, 3 May 2013 18:55:51 +0000 (18:55 +0000)]
Merge "Fix dalvik tests post-conscrypt."
Elliott Hughes [Fri, 3 May 2013 18:54:59 +0000 (11:54 -0700)]
Fix dalvik tests post-conscrypt.
Change-Id: I36b942916330a3d6a06fad93dd9aa0533b47ff85
Elliott Hughes [Fri, 3 May 2013 18:54:34 +0000 (18:54 +0000)]
Merge "Fix some leaks in VfyBasicBlock & BitVector."
You Kim [Wed, 3 Apr 2013 19:24:20 +0000 (04:24 +0900)]
Fix some leaks in VfyBasicBlock & BitVector.
Change-Id: I20050135588fc96268911b8ab690b04c8ad949bc
Raphaël Moll [Fri, 3 May 2013 03:30:23 +0000 (20:30 -0700)]
am
7dc0b702: Merge "Fix dx to match the new SDK structure."
* commit '
7dc0b702819701bbda50ff23670c01f9ea3cc646':
Fix dx to match the new SDK structure.
Raphaël Moll [Fri, 3 May 2013 03:18:41 +0000 (03:18 +0000)]
Merge "Fix dx to match the new SDK structure."
buzbee [Fri, 3 May 2013 00:41:30 +0000 (17:41 -0700)]
am
f85b49fe: Fix JIT initialization race
* commit '
f85b49fedc9367dfc0554a2b27115e046cc4dfec':
Fix JIT initialization race
Raphael Moll [Thu, 2 May 2013 22:38:10 +0000 (15:38 -0700)]
am
315197f3: Merge "Fix dx.bat to match the new SDK structure."
* commit '
315197f351a4d49a64c90cf28e6c02677b37868e':
Fix dx.bat to match the new SDK structure.
Xavier Ducrohet [Tue, 26 Mar 2013 17:24:05 +0000 (10:24 -0700)]
Fix dx to match the new SDK structure.
(cherry picked from commit
cb9dfa123c6fcc43be629666837c4e6f86b476ea)
Change-Id: I071d73adc4a2eb812cdbc204d27884f4a527043d
Raphael Moll [Thu, 2 May 2013 22:14:50 +0000 (22:14 +0000)]
Merge "Fix dx.bat to match the new SDK structure."
buzbee [Wed, 1 May 2013 17:22:28 +0000 (10:22 -0700)]
Fix JIT initialization race
See b/
8767735 Slow thread in thread spin test
A race exists in thread creation/JIT initialization that can
leave the JIT permanantly disabled for a thread (typically
the first interpreter thread).
(cherry-pick from master If6fcac93a229edf068eb02ceceb374e3dc284b78)
Change-Id: I120af6f753984d63d43122ea30db102bd1d5cc63
Brian Carlstrom [Thu, 2 May 2013 16:13:09 +0000 (09:13 -0700)]
am
11cadca4: Merge "Tracking changes to *-host for host shared libraries"
* commit '
11cadca43899aa166e7d68bbaddeb2481d704454':
Tracking changes to *-host for host shared libraries
Brian Carlstrom [Thu, 2 May 2013 16:08:06 +0000 (16:08 +0000)]
Merge "Tracking changes to *-host for host shared libraries"
Brian Carlstrom [Thu, 2 May 2013 04:53:49 +0000 (21:53 -0700)]
Tracking changes to *-host for host shared libraries
Change-Id: I764889011cc259cdca306e2145bcc4c8c75eced5
Elliott Hughes [Wed, 1 May 2013 21:04:56 +0000 (14:04 -0700)]
am
6e3adcc6: Merge "Fix JIT initialization race"
* commit '
6e3adcc6036858531ec41bea8b2ca3b9980d6413':
Fix JIT initialization race
Elliott Hughes [Wed, 1 May 2013 20:57:13 +0000 (20:57 +0000)]
Merge "Fix JIT initialization race"
buzbee [Wed, 1 May 2013 17:22:28 +0000 (10:22 -0700)]
Fix JIT initialization race
See b/
8767735 Slow thread in thread spin test
A race exists in thread creation/JIT initialization that can
leave the JIT permanantly disabled for a thread (typically
the first interpreter thread).
(cherry-pick of
67985d960f5c877f86d0bba251d2d55c7a062b8d.)
Change-Id: Ic7e3a1cde2833ac78455fa5d465156b5e0896fc1
Brian Carlstrom [Wed, 1 May 2013 01:12:28 +0000 (18:12 -0700)]
am
15554a2f: Merge "Update dalvik host script for new conscrypt and okhttp classpath entries"
* commit '
15554a2f2d4920357f6cf1a0505a178de3781f77':
Update dalvik host script for new conscrypt and okhttp classpath entries
Brian Carlstrom [Wed, 1 May 2013 00:57:28 +0000 (00:57 +0000)]
Merge "Update dalvik host script for new conscrypt and okhttp classpath entries"
Brian Carlstrom [Wed, 1 May 2013 00:51:03 +0000 (17:51 -0700)]
Update dalvik host script for new conscrypt and okhttp classpath entries
Change-Id: I9af7dfeb7387544bff98af55716f3db9808e39cb
Brian Carlstrom [Tue, 30 Apr 2013 23:25:10 +0000 (16:25 -0700)]
am
b66781c5: Merge changes I3ef1ad8c,I0bbbba1a,Ife107fb6,Ia420b766
* commit '
b66781c5bf4da1f6fdcbc5a1fcd2c962294b661c':
Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
Move dex utilities from dalvik/dx to libcore/dex
Mechanical refactoring of dx into two parts.
Change com.android.dx.io.Annotation to use EncodedValue
Brian Carlstrom [Tue, 30 Apr 2013 23:25:09 +0000 (16:25 -0700)]
am
71cf82a3: Merge "Teach dex how to parse encoded values from .dex files."
* commit '
71cf82a34cdd9b22ca9000575ab490a9a2c13cc8':
Teach dex how to parse encoded values from .dex files.
Brian Carlstrom [Tue, 30 Apr 2013 21:45:35 +0000 (21:45 +0000)]
Merge changes I3ef1ad8c,I0bbbba1a,Ife107fb6,Ia420b766
* changes:
Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
Move dex utilities from dalvik/dx to libcore/dex
Mechanical refactoring of dx into two parts.
Change com.android.dx.io.Annotation to use EncodedValue
Brian Carlstrom [Tue, 30 Apr 2013 21:45:26 +0000 (21:45 +0000)]
Merge "Teach dex how to parse encoded values from .dex files."
Jesse Wilson [Mon, 19 Sep 2011 02:45:39 +0000 (22:45 -0400)]
Switch Dex from byte[] to ByteBuffer for backing store. Part 2.
Change-Id: Ifd3672027d075b6c9f8df208a04bc33122c883af
(cherry picked from commit
f8357511efd16d76ce4410459c15dbb08b0140b6)
Conflicts:
dx/src/com/android/dx/merge/DexMerger.java
Jesse Wilson [Sun, 18 Sep 2011 16:53:38 +0000 (12:53 -0400)]
Move dex utilities from dalvik/dx to libcore/dex
Change-Id: If0022a069ba3ac51ae5cdc4b0eabb6b913cd8afe
(cherry picked from commit
7b13a4d41243f81fe80a76e2ff2f877b53610446)
Conflicts:
dx/src/com/android/dex/Code.java
dx/src/com/android/dex/Dex.java
dx/src/com/android/dex/SizeOf.java
dx/src/com/android/dex/TableOfContents.java
Jesse Wilson [Sat, 17 Sep 2011 03:10:02 +0000 (23:10 -0400)]
Mechanical refactoring of dx into two parts.
This splits off a new package, com.android.dex that contains
code for parsing and modelling dex files. This code is usable
both at build time (for compilation and analysis) and at runtime
(for introspection).
The original package, com.android.dx is the tool that compiles
.class files into .dex files. That package also includes utilities
for merging and querying dex files, all visible to the dx command
line application.
In a follow up change I'll move the new com.android.dex package
into the libcore/ project, and configure build rules so that it's
included in both dx.jar and core.jar. The core.jar will then be
able to use it for annotation processing.
Change-Id: I3c58cf87e728e4dda1925a0992c1ee7b8130e81a
(cherry picked from commit
bab4abb07335d162ecdb8091fc395cf84803a580)
Conflicts:
dx/junit-tests/com/android/dx/util/BitIntSetTest.java
dx/junit-tests/com/android/dx/util/BitsTest.java
dx/junit-tests/com/android/dx/util/IntListTest.java
dx/junit-tests/com/android/dx/util/ListIntSetTest.java
dx/src/com/android/dex/Dex.java
dx/src/com/android/dex/TableOfContents.java
dx/src/com/android/dx/annotations/AnnotationAccess.java
dx/src/com/android/dx/command/Main.java
dx/src/com/android/dx/dex/code/OutputFinisher.java
dx/src/com/android/dx/dex/code/form/Form32s.java
dx/src/com/android/dx/dex/code/form/Form33x.java
dx/src/com/android/dx/dex/code/form/Form41c.java
dx/src/com/android/dx/dex/code/form/Form52c.java
dx/src/com/android/dx/gen/DexGenerator.java
dx/src/com/android/dx/merge/DexMerger.java
Brian Carlstrom [Tue, 30 Apr 2013 01:26:09 +0000 (18:26 -0700)]
Change com.android.dx.io.Annotation to use EncodedValue
(cherry picked from commit
4ec022b0b6c84f994ab2fc78934110ad96d0bdec)
Change-Id: Ia420b7661f372c59af8fe62bdab7982a1d2b008f
Jesse Wilson [Thu, 15 Sep 2011 19:49:25 +0000 (15:49 -0400)]
Teach dex how to parse encoded values from .dex files.
Previously primitive values were treated as opaque byte arrays.
Now the encoded values can be interpreted as their proper types:
integers, indices, floats, chars, etc. This gets complicated
pretty fast due to the dense packing dx performs when encoding
the values.
The encoding code is moved from ValueEncoder. The decoding code
is ported from C++ to Java from Annotation.cpp.
There's a bunch of new tests to make sure the decoding is correct;
porting from C++ to Java was tricky because of the '>>' shifts on
unsigned values. The test input data is generated by dex!
Change-Id: I83b2fc3e16115d667fa94b3dab782d1a9687f3ad
(cherry picked from commit
27847605b9255358f0577ffec28886c450263898)
Elliott Hughes [Fri, 26 Apr 2013 17:44:59 +0000 (10:44 -0700)]
am
33a977ec: Merge "Fix JIT bug related to immediate doubles"
* commit '
33a977ec6a12deb22bcc87f8c294439b3aba16ab':
Fix JIT bug related to immediate doubles