OSDN Git Service
Elliott Hughes [Wed, 5 Jun 2013 21:21:13 +0000 (14:21 -0700)]
am
e421d118: am
007c01f8: Merge "Fix a minor leak in dvmCreateInlineSubsTable"
* commit '
e421d1188052f89988d6774b5375cf844dea1cd0':
Fix a minor leak in dvmCreateInlineSubsTable
Elliott Hughes [Wed, 5 Jun 2013 21:17:24 +0000 (14:17 -0700)]
am
619965a0: am
1da7fec6: Merge "Fix minor leaks caused by failed initialization in JNI_CreateJavaVM"
* commit '
619965a0c6e49f6fc29a3cd15052eb4ded9348b9':
Fix minor leaks caused by failed initialization in JNI_CreateJavaVM
Elliott Hughes [Wed, 5 Jun 2013 21:14:16 +0000 (14:14 -0700)]
am
007c01f8: Merge "Fix a minor leak in dvmCreateInlineSubsTable"
* commit '
007c01f862019fa4703cd0b3289b3cc26d4ad452':
Fix a minor leak in dvmCreateInlineSubsTable
Elliott Hughes [Wed, 5 Jun 2013 21:13:00 +0000 (21:13 +0000)]
Merge "Fix a minor leak in dvmCreateInlineSubsTable"
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:10:33 +0000 (14:10 -0700)]
am
784f34d6: am
f6944312: Merge "Fix a minor bug in dvmCreateInterpThread"
* commit '
784f34d6badf691a14ea121405fb0632182f81de':
Fix a minor bug in dvmCreateInterpThread
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:36:16 +0000 (13:36 -0700)]
am
de241376: am
91027c67: Merge "Remove unused compiler templates for armv7-a*"
* commit '
de2413762e3626039cadf270479f30dea6307fe8':
Remove unused compiler templates for armv7-a*
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:26:47 +0000 (13:26 -0700)]
am
b91f922c: am
f3079bda: Merge "Rename unreasonable function name dmvCompilerTemplateEnd"
* commit '
b91f922c80b454fa579deaee262bdd51225b82ee':
Rename unreasonable function name dmvCompilerTemplateEnd
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
buzbee [Fri, 24 May 2013 13:02:32 +0000 (13:02 +0000)]
Merge "JIT tuning; set cache size on command line"
buzbee [Thu, 23 May 2013 20:53:50 +0000 (13:53 -0700)]
JIT tuning; set cache size on command line
The tuning knobs for triggering trace compilation for the JIT
had not been revisited for several years. In that time, the
working set of some applications have significantly increased,
leading to frequent cache overlows & flushes.
This CL adds the ability to set the maximum size of the JIT's
cache on the command line, and we expect to use different settings
depending on device configuration (rule of thumb: 1K for each 1M
for system RAM, with 2M limit).
Additionally, the trace compilation trigger has been tightened to
limit the compilation of cold traces.
Change-Id: Ice22c5d9d46a93e465c57dd83f50ca3912f1672e
Brian Carlstrom [Wed, 22 May 2013 19:52:09 +0000 (12:52 -0700)]
Remove jdwpspy from dalvik as it has been added to art
Change-Id: I59e5cd2a49a912bbd7ccfea0c6d6c2d10ec6fc99
Brian Carlstrom [Wed, 22 May 2013 19:36:36 +0000 (12:36 -0700)]
am
8c44176c: am
8eac07c9: Merge "Move jdwpspy from development to dalvik (2 of 2)"
* commit '
8c44176ceda51ac586346a64a5ce3af2c0e66624':
Move jdwpspy from development to dalvik (2 of 2)
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:40:04 +0000 (00:40 -0700)]
am
c5e4f6bb: am
97208a0b: Merge "Added support for version 51 class files in dx"
* commit '
c5e4f6bb17ee5a14de139f2780a06329d49554eb':
Added support for version 51 class files in dx
Jean-Philippe Lesot [Fri, 17 May 2013 07:40:03 +0000 (00:40 -0700)]
am
879faf41: am
467f7e3a: Merge "Report problems as errors in dx (with exit codes)"
* commit '
879faf41e2106d2bf9f59adc0df4263e4014ff2d':
Report problems as errors in dx (with exit codes)
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:44:27 +0000 (05:44 -0700)]
am
9fc96fac: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
9fc96facfd38ae616ae02ad4c54e5114cc088540':
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:07:34 +0000 (12:07 -0700)]
am
f54b2237: am
9275963e: Merge "Move verification of class access flags to libdex"
* commit '
f54b22371370858679ea9908f67b2b06a87ad2f6':
Move verification of class access flags to libdex
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:36:21 +0000 (07:36 -0700)]
am
de33df54: am
130eebad: Merge "Adapt dalvik to new libnativehelper"
* commit '
de33df540b44d21678081c975ef74d4e8a8a7581':
Adapt dalvik to new libnativehelper
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
Elliott Hughes [Wed, 8 May 2013 22:04:52 +0000 (15:04 -0700)]
am
79d08ba3: am
fd6ac490: Merge "Reject dex files that attempt to use unspecified class access flags"
* commit '
79d08ba33bf5ea639559cd680ac132c1cb81fc3d':
Reject dex files that attempt to use unspecified class access flags
Jamie Gennis [Wed, 8 May 2013 22:03:59 +0000 (15:03 -0700)]
am
cc1f56d4: am
858dfecf: Merge "Add systrace tracing for GC and thread suspension." into jb-mr2-dev
* commit '
cc1f56d4aaba9c4a0c64525b0b48561e65df98df':
Add systrace tracing for GC and thread suspension.
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
Nick Kralevich [Tue, 7 May 2013 20:56:16 +0000 (20:56 +0000)]
Merge "Don't emit a warning message on missing PR_SET_NO_NEW_PRIVS"
Nick Kralevich [Tue, 7 May 2013 17:38:21 +0000 (10:38 -0700)]
Don't emit a warning message on missing PR_SET_NO_NEW_PRIVS
If the kernel doesn't support PR_SET_NO_NEW_PRIVS, then
don't print a warning message. The warning message only serves
to confuse other people.
This change assumes that, if EINVAL is returned, the kernel is an
old kernel. Newer kernels have no option to disable PR_SET_NO_NEW_PRIVS,
so IMHO, this is a fair assumption.
Change-Id: I77b4769e1d93a9b2412ba5365227283761940fdc
Dima Zavin [Tue, 7 May 2013 17:25:31 +0000 (10:25 -0700)]
am
8c1b55ce: am
3b5c07d6: Merge "vm: vmruntime: remove obsolete dependency on array.h"
* commit '
8c1b55ce7f968ae7a791bbbf50ac641022826fb9':
vm: vmruntime: remove obsolete dependency on array.h
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:20 +0000 (07:49 +0000)]
Merge "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>
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:22:09 +0000 (14:22 -0700)]
am
e30d296d: am
ac653462: Merge "Fix alignment when recompacting a DexMerger result."
* commit '
e30d296d0c3c1c6728129380302cd84e0a4301bd':
Fix alignment when recompacting a DexMerger result.
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:24:30 +0000 (11:24 -0700)]
am
5c667437: am
647260b2: Merge "Use zero filled alignment padding before method code"
* commit '
5c667437d7df50bb1e63419dbb34afdc7054c310':
Use zero filled alignment padding before method code
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:25:23 +0000 (18:25 -0700)]
am
be8536cb: am
1d6aa9e2: Merge "Allow the merging of more than 2 dex file at a time."
* commit '
be8536cb6b6f294b4755e61d182fb9debdb13007':
Allow the merging of more than 2 dex file at a time.
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:10:49 +0000 (18:10 -0700)]
am
26bf269b: am
d1d01989: Merge "Fix bug on register compatibility."
* commit '
26bf269b6d117fd3282573d536958e4d3bd78f50':
Fix bug on register compatibility.
Brian Carlstrom [Sat, 4 May 2013 01:10:48 +0000 (18:10 -0700)]
am
eb4859a1: am
f7e2a548: Merge "Remove duplicate LOCAL_MODULE_TAGS"
* commit '
eb4859a1908996a16272f2a9e506c896cec68e0d':
Remove duplicate LOCAL_MODULE_TAGS
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:57:13 +0000 (17:57 -0700)]
am
983a1f14: am
ee48f542: Merge "Fix bad whitespace alignment from LOGW to ALOGW change"
* commit '
983a1f14f507843d20d2a9096c6fc2211ac3f225':
Fix bad whitespace alignment from LOGW to ALOGW change
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:50 +0000 (17:53 -0700)]
am
70b4848f: resolved conflicts for merge of
c7f23a58 to jb-mr2-dev-plus-aosp
* commit '
70b4848fe3b18bc848d1963b709aeb078c9c464c':
Remove dx's copy of JUnit. (part II)
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:11:58 +0000 (16:11 -0700)]
am
1634c64c: am
34e2dd66: Merge "Define scripts for calling DexMerger."
* commit '
1634c64ce162d79aad96a7d7ca82fa0f750d5df6':
Define scripts for calling DexMerger.
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:58:24 +0000 (15:58 -0700)]
am
b0711854: am
69fcce64: Merge "Print proto_ids_{size,off} along with the rest of the header."
* commit '
b0711854c098f17630f6f0582d098397c19b128a':
Print proto_ids_{size,off} along with the rest of the header.
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:38:08 +0000 (15:38 -0700)]
am
76f39218: am
1f7ec2be: Merge "Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES"
* commit '
76f392185ce17839c58a1d10d9c5eb5a338f9f0d':
Remove unnecessary JNI_H_INCLUDE from LOCAL_C_INCLUDES
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