OSDN Git Service
Sebastien Hertz [Tue, 26 Aug 2014 14:42:28 +0000 (16:42 +0200)]
resolved conflicts for merge of
052c87cd to lmp-dev-plus-aosp
Change-Id: I8dcfe972e209996d26f9ac9c2028a0d6146fec1b
Sebastien Hertz [Tue, 26 Aug 2014 13:50:57 +0000 (13:50 +0000)]
am
83182ed4: Merge "Reduce lock contention when debugging" into lmp-dev
* commit '
83182ed48c55729cd34780fc598f269cc98af739':
Reduce lock contention when debugging
Sebastien Hertz [Tue, 26 Aug 2014 13:43:17 +0000 (13:43 +0000)]
Merge "Reduce lock contention when debugging" into lmp-dev
buzbee [Tue, 26 Aug 2014 13:15:57 +0000 (13:15 +0000)]
am
5c36e461: am
cb50ed40: Merge "Quick compiler: fix DCHECK" into lmp-dev
* commit '
5c36e4619c88ce059211f69638c4d690905b7995':
Quick compiler: fix DCHECK
buzbee [Tue, 26 Aug 2014 13:09:04 +0000 (13:09 +0000)]
am
cb50ed40: Merge "Quick compiler: fix DCHECK" into lmp-dev
* commit '
cb50ed40fc39a1c1786e57f5c839a3cd230e1744':
Quick compiler: fix DCHECK
buzbee [Tue, 26 Aug 2014 12:58:44 +0000 (12:58 +0000)]
Merge "Quick compiler: fix DCHECK" into lmp-dev
Ang Li [Tue, 26 Aug 2014 11:30:30 +0000 (11:30 +0000)]
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-dev-plus-aosp
Brian Carlstrom [Tue, 26 Aug 2014 11:29:42 +0000 (11:29 +0000)]
am
b7326b50: Merge "CheckAndClearResolveException should allow LinkageError"
* commit '
b7326b502dd5afe6d8eae60d5f85bde0a94c6956':
CheckAndClearResolveException should allow LinkageError
Mathieu Chartier [Tue, 26 Aug 2014 11:29:41 +0000 (11:29 +0000)]
am
5a1a39a6: Merge "Reduce GC log spam."
* commit '
5a1a39a67260704fbc76c9a6a58b330a2df6827a':
Reduce GC log spam.
Brian Carlstrom [Tue, 26 Aug 2014 11:29:26 +0000 (11:29 +0000)]
am
bd8921ca: am
118785c6: CheckAndClearResolveException should allow LinkageError
* commit '
bd8921ca0cdf5716d0ffe5d8b298d25bf46dcb89':
CheckAndClearResolveException should allow LinkageError
Brian Carlstrom [Tue, 26 Aug 2014 11:18:28 +0000 (11:18 +0000)]
am
118785c6: CheckAndClearResolveException should allow LinkageError
* commit '
118785c6f82ac1ec7074b5efe367b3dafd904940':
CheckAndClearResolveException should allow LinkageError
Brian Carlstrom [Tue, 26 Aug 2014 06:40:32 +0000 (06:40 +0000)]
Merge "CheckAndClearResolveException should allow LinkageError"
Brian Carlstrom [Tue, 26 Aug 2014 06:07:30 +0000 (23:07 -0700)]
CheckAndClearResolveException should allow LinkageError
Bug:
16565964
(cherry picked from commit
118785c6f82ac1ec7074b5efe367b3dafd904940)
Change-Id: I7bc170e7a9ee9bd19defdd20187ee36a2381bf5d
Brian Carlstrom [Tue, 26 Aug 2014 06:07:30 +0000 (23:07 -0700)]
CheckAndClearResolveException should allow LinkageError
Bug:
16565964
Change-Id: Ibf236c627519a5cdef9479b7bc21e931d5474abf
Mathieu Chartier [Tue, 26 Aug 2014 04:57:15 +0000 (04:57 +0000)]
am
213a5434: am
eac98d7c: Merge "Reduce GC log spam." into lmp-dev
* commit '
213a543484ad437389ba325b62567f95d273d8d2':
Reduce GC log spam.
Alex Light [Tue, 26 Aug 2014 04:52:24 +0000 (04:52 +0000)]
am
6b33bed4: am
0699fbf7: Reduce log spam by changing a LOG(INFO) to VLOG(startup)
* commit '
6b33bed442b9152e3a707792d633c3b4d316ebc0':
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Alex Light [Tue, 26 Aug 2014 04:52:23 +0000 (04:52 +0000)]
am
0e73bdac: (-s ours) am
507e6180: Support running without a boot image.
* commit '
0e73bdac10d1d5aa27351a90a01d516c101f36b1':
Support running without a boot image.
Mathieu Chartier [Tue, 26 Aug 2014 04:17:42 +0000 (04:17 +0000)]
am
0b50629a: Merge "Fixed typo in entrypoint stub."
* commit '
0b50629a79a387b4ab2066610c4803aae046ab30':
Fixed typo in entrypoint stub.
Hiroshi Yamauchi [Tue, 26 Aug 2014 04:17:40 +0000 (04:17 +0000)]
am
32b49871: Merge "Remove an intermediate field array in ClassLinker::InitializeClass."
* commit '
32b498713a11958bac2af0f51b2b49ef88f4bd07':
Remove an intermediate field array in ClassLinker::InitializeClass.
Mathieu Chartier [Tue, 26 Aug 2014 03:42:19 +0000 (03:42 +0000)]
am
eac98d7c: Merge "Reduce GC log spam." into lmp-dev
* commit '
eac98d7cb0f84c664d22deebf1ae5062730d7a31':
Reduce GC log spam.
Mathieu Chartier [Tue, 26 Aug 2014 03:31:59 +0000 (03:31 +0000)]
Merge "Reduce GC log spam."
Mathieu Chartier [Tue, 26 Aug 2014 02:46:57 +0000 (19:46 -0700)]
Reduce GC log spam.
Homogeneous compaction and collector transitions now print to
VLOG(gc) instead of LOG(INFO).
Bug:
17166556
(cherry picked from commit
0ab56e95e203806dae347056d3331a3e6037457d)
Change-Id: I33157ca27da86cbb741759bb0bda6d38d1f5bfcd
Mathieu Chartier [Tue, 26 Aug 2014 03:30:33 +0000 (03:30 +0000)]
Merge "Reduce GC log spam." into lmp-dev
Mathieu Chartier [Tue, 26 Aug 2014 02:46:57 +0000 (19:46 -0700)]
Reduce GC log spam.
Homogeneous compaction and collector transitions now print to
VLOG(gc) instead of LOG(INFO).
Bug:
17166556
Change-Id: I5d54acf36a9b2763922e6329596a2f191d45535c
Mathieu Chartier [Tue, 26 Aug 2014 01:30:04 +0000 (01:30 +0000)]
Merge "Fixed typo in entrypoint stub."
Fred Shih [Tue, 26 Aug 2014 01:19:50 +0000 (18:19 -0700)]
Fixed typo in entrypoint stub.
Fixed typo for x86 stub causing mac build failure.
Change-Id: I5e063fb87c598c2d9beb22f6d5b97b7fd4df9b84
Hiroshi Yamauchi [Tue, 26 Aug 2014 00:27:55 +0000 (00:27 +0000)]
Merge "Remove an intermediate field array in ClassLinker::InitializeClass."
Ian Rogers [Tue, 26 Aug 2014 00:13:11 +0000 (00:13 +0000)]
am
1ff1747e: Merge "ART: Extending FlagsOf"
* commit '
1ff1747e71f0e1b3dbb181b52c2b4880bfa019fc':
ART: Extending FlagsOf
Hiroshi Yamauchi [Fri, 22 Aug 2014 19:12:56 +0000 (12:12 -0700)]
Remove an intermediate field array in ClassLinker::InitializeClass.
This improves on CL 105090 by removing the need for the intermediate
field array by iterating two iterators in parallel.
Bug:
12687968
Change-Id: I32d4570948a9d39ccb1c20a02e18b48f15ed0738
Ian Rogers [Mon, 25 Aug 2014 22:52:34 +0000 (22:52 +0000)]
Merge "ART: Extending FlagsOf"
buzbee [Mon, 25 Aug 2014 16:34:03 +0000 (09:34 -0700)]
Quick compiler: fix DCHECK
A DCHECK intended to verify the soundness of the mapping between
a wide Dalvik value and a pair of temp registers incorrectly fired
when the temp register pair was associated with a wide temporary
(i.e. - when (SReg() == INVALID_SREG)).
In this particular situation, the wideness flag is meaningful only when
there is an associated valid vreg. Code rearranged to only perform
the DCHECK and reset the partner's wideness bit when we're dealing with
a live wide value.
b/
16484538
Change-Id: I3b8a7bebc5d918c65ea56ae8db0a8a5cd8003386
Mathieu Chartier [Mon, 25 Aug 2014 21:48:57 +0000 (21:48 +0000)]
am
7713d104: Merge "Reduced memory usage of primitive fields smaller than 4-bytes"
* commit '
7713d104f34606161fbf36497be2e2aa76d87ca9':
Reduced memory usage of primitive fields smaller than 4-bytes
Mathieu Chartier [Mon, 25 Aug 2014 21:23:50 +0000 (21:23 +0000)]
Merge "Reduced memory usage of primitive fields smaller than 4-bytes"
Jean Christophe Beyler [Tue, 29 Jul 2014 20:20:42 +0000 (13:20 -0700)]
ART: Extending FlagsOf
Modified FlagsOf to handle extended flags.
Change-Id: I9e47e0c42816136b2b53512c914200dd9dd11376
Signed-off-by: Jean Christophe Beyler <jean.christophe.beyler@intel.com>
Alex Light [Mon, 25 Aug 2014 18:57:06 +0000 (18:57 +0000)]
am
0699fbf7: Reduce log spam by changing a LOG(INFO) to VLOG(startup)
* commit '
0699fbf769befd3a850005790b26941c38fa2fb4':
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Alex Light [Mon, 25 Aug 2014 18:57:05 +0000 (18:57 +0000)]
am
507e6180: Support running without a boot image.
* commit '
507e6180ad271eb719c67ce7394852c731d975a5':
Support running without a boot image.
Brian Carlstrom [Mon, 25 Aug 2014 18:40:35 +0000 (18:40 +0000)]
am
072a8bf6: Merge "Reduce log spam by changing a LOG(INFO) to VLOG(startup)"
* commit '
072a8bf6883b6f6f178200ff9f03aa8d56a83c40':
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Alex Light [Thu, 21 Aug 2014 16:45:00 +0000 (09:45 -0700)]
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Bug:
17166556
(cherry picked from commit
b6cabc1345ec307559a6e85141fb69b7caa9413c)
Change-Id: I9975ba07ad8f119a6e367e2770a60040a462149b
Fred Shih [Thu, 17 Jul 2014 01:38:08 +0000 (18:38 -0700)]
Reduced memory usage of primitive fields smaller than 4-bytes
Reduced memory used by byte and boolean fields from 4 bytes down to a
single byte and shorts and chars down to two bytes. Fields are now
arranged as Reference followed by decreasing component sizes, with
fields shuffled forward as needed.
Bug:
8135266
Change-Id: I65eaf31ed27e5bd5ba0c7d4606454b720b074752
Brian Carlstrom [Mon, 25 Aug 2014 18:12:06 +0000 (18:12 +0000)]
Merge "Reduce log spam by changing a LOG(INFO) to VLOG(startup)"
Alex Light [Tue, 19 Aug 2014 21:23:13 +0000 (14:23 -0700)]
Support running without a boot image.
Bug:
17000769
(cherry picked from commit
64ad14dbe2225441fb7734bf6d89358d96692eea)
Change-Id: I6404d5050c8a2f4ee6e70d58532eb25ee9de248e
Brian Carlstrom [Mon, 25 Aug 2014 18:07:43 +0000 (18:07 +0000)]
am
e25826e2: Merge "Support running without a boot image."
* commit '
e25826e28ea65d9c1aa23f84788a091c677b20c7':
Support running without a boot image.
Mathieu Chartier [Mon, 25 Aug 2014 18:07:42 +0000 (18:07 +0000)]
am
21259fed: Merge "Fix GC memory overhead accounting."
* commit '
21259fedf4fd0f786c71f69493ebfbb9affe3a8d':
Fix GC memory overhead accounting.
Mathieu Chartier [Mon, 25 Aug 2014 18:06:05 +0000 (18:06 +0000)]
am
6e384ed1: am
73aa0b03: Merge "Fix GC memory overhead accounting." into lmp-dev
* commit '
6e384ed176ed197887013387c9ddd455cf76594e':
Fix GC memory overhead accounting.
Alex Light [Thu, 21 Aug 2014 16:45:00 +0000 (09:45 -0700)]
Reduce log spam by changing a LOG(INFO) to VLOG(startup)
Bug:
17166556
Change-Id: I9975ba07ad8f119a6e367e2770a60040a462149b
Mathieu Chartier [Mon, 25 Aug 2014 18:03:26 +0000 (18:03 +0000)]
am
9177f20c: Merge "Clean up Handle usage."
* commit '
9177f20c8c090a94c3558abdafececf51e5417d1':
Clean up Handle usage.
Mathieu Chartier [Mon, 25 Aug 2014 17:54:06 +0000 (17:54 +0000)]
am
73aa0b03: Merge "Fix GC memory overhead accounting." into lmp-dev
* commit '
73aa0b03a56a19b73c51136c32624bc5069782e0':
Fix GC memory overhead accounting.
Brian Carlstrom [Mon, 25 Aug 2014 17:51:38 +0000 (17:51 +0000)]
Merge "Support running without a boot image."
Mathieu Chartier [Mon, 25 Aug 2014 17:47:37 +0000 (17:47 +0000)]
Merge "Fix GC memory overhead accounting."
Mathieu Chartier [Mon, 25 Aug 2014 17:43:17 +0000 (17:43 +0000)]
Merge "Fix GC memory overhead accounting." into lmp-dev
Mathieu Chartier [Thu, 21 Aug 2014 19:21:48 +0000 (12:21 -0700)]
Fix GC memory overhead accounting.
There was some missing null checks.
Bug:
16238192
(cherry picked from commit
2e290fb35ba1959e5a0ac85e87591ab9623808c1)
Change-Id: I4220272ac9c194e30fc307fca9918a4bb725e261
Alex Light [Tue, 19 Aug 2014 21:23:13 +0000 (14:23 -0700)]
Support running without a boot image.
Bug:
17000769
Change-Id: I6404d5050c8a2f4ee6e70d58532eb25ee9de248e
Mathieu Chartier [Mon, 25 Aug 2014 16:50:39 +0000 (16:50 +0000)]
Merge "Clean up Handle usage."
Mathieu Chartier [Sat, 23 Aug 2014 23:37:27 +0000 (16:37 -0700)]
Clean up Handle usage.
Prefer using ConstHandle instead of Handle as function arguments
since you can't assign new references to ConstHandle which helps
prevent bugs.
Changed NullHandle to be a ConstHandle so that you can never modify
it to be a non null reference.
Change-Id: I81cb979f6f8d5b49e5614966a2caf28c3701dd4f
Andreas Gampe [Sat, 23 Aug 2014 06:13:45 +0000 (23:13 -0700)]
resolved conflicts for merge of
495541b1 to lmp-dev-plus-aosp
Change-Id: I2cd82b1a6976983f5042d846e92dd03b2de66203
Andreas Gampe [Sat, 23 Aug 2014 06:05:48 +0000 (06:05 +0000)]
am
762f0a5b: Merge "ART: Clean up compiler"
* commit '
762f0a5bdd238458bbb463a9565388f2047a98d4':
ART: Clean up compiler
Andreas Gampe [Sat, 23 Aug 2014 05:47:17 +0000 (05:47 +0000)]
Merge "ART: Clean up compiler"
Andreas Gampe [Wed, 13 Aug 2014 06:19:23 +0000 (23:19 -0700)]
ART: Clean up compiler
Clean up the compiler: less extern functions, dis-entangle
compilers, hide some compiler specifics, lower global includes.
Change-Id: Ibaf88d02505d86994d7845cf0075be5041cc8438
Mathieu Chartier [Sat, 23 Aug 2014 01:36:04 +0000 (01:36 +0000)]
am
e6916c42: Merge "Add fallback for non moving space being full."
* commit '
e6916c429c16ae8ae3b8cd641d662742c23d1fb5':
Add fallback for non moving space being full.
Mathieu Chartier [Sat, 23 Aug 2014 01:20:59 +0000 (01:20 +0000)]
am
83a2192d: Merge "Add fallback for non moving space being full." into lmp-dev
* commit '
83a2192d360cdf678c9d4422b5f1bc73d5df602b':
Add fallback for non moving space being full.
Mathieu Chartier [Sat, 23 Aug 2014 01:09:34 +0000 (01:09 +0000)]
Merge "Add fallback for non moving space being full."
Mathieu Chartier [Fri, 22 Aug 2014 21:53:04 +0000 (14:53 -0700)]
Add fallback for non moving space being full.
When the non moving space becomes full, we disable moving GC and
make the main space the new non moving space.
Also added a runtime option for changing the non moving space size:
-XX:NonMovingSpaceCapacity.
Bug:
17189964
(cherry picked from commit
4c5a469683e433f126c9863cd393747d2e7c4a29)
Change-Id: If82e3c6f8a0f389e37e14a0b1e6d5126d571fd7a
Mathieu Chartier [Sat, 23 Aug 2014 01:01:19 +0000 (01:01 +0000)]
Merge "Add fallback for non moving space being full." into lmp-dev
Mathieu Chartier [Fri, 22 Aug 2014 21:53:04 +0000 (14:53 -0700)]
Add fallback for non moving space being full.
When the non moving space becomes full, we disable moving GC and
make the main space the new non moving space.
Also added a runtime option for changing the non moving space size:
-XX:NonMovingSpaceCapacity.
Bug:
17189964
Change-Id: I04d00d0f457f6c1f5724bf32932b6b6ce4d341b1
Ian Rogers [Sat, 23 Aug 2014 00:12:03 +0000 (00:12 +0000)]
am
e18aa431: Merge "ART: Support MIRGraph constant interface"
* commit '
e18aa4316eb9a15cd6b1051f27a1ce49967c170e':
ART: Support MIRGraph constant interface
Ian Rogers [Fri, 22 Aug 2014 23:14:27 +0000 (23:14 +0000)]
Merge "ART: Support MIRGraph constant interface"
Ian Rogers [Fri, 22 Aug 2014 22:28:52 +0000 (22:28 +0000)]
am
02cdc91c: Merge "Using the correct time for wait_start_ms when lock contention logging is enabled"
* commit '
02cdc91cae56a91e7833eae154fe9a7694103ae5':
Using the correct time for wait_start_ms when lock contention logging is enabled
Razvan A Lupusoru [Mon, 4 Aug 2014 19:30:20 +0000 (12:30 -0700)]
ART: Support MIRGraph constant interface
-Adds a helper to be able to ask for a wide constant.
-Allows MIRGraph to provide interface to set constants.
Change-Id: Id282ee1604a0bd0bce6f495176d6bca35dcd5a00
Signed-off-by: Razvan A Lupusoru <razvan.a.lupusoru@intel.com>
Ian Rogers [Fri, 22 Aug 2014 22:06:47 +0000 (22:06 +0000)]
am
1d4b6eff: am
1e4fbd8b: Merge "Using the correct time for wait_start_ms when lock contention logging is enabled" into lmp-dev
* commit '
1d4b6eff25aa29cbbf4d216d65349e1ad38f962e':
Using the correct time for wait_start_ms when lock contention logging is enabled
Ian Rogers [Fri, 22 Aug 2014 21:59:25 +0000 (21:59 +0000)]
Merge "Using the correct time for wait_start_ms when lock contention logging is enabled"
Xin Guan [Fri, 22 Aug 2014 16:55:37 +0000 (11:55 -0500)]
Using the correct time for wait_start_ms when lock contention logging is enabled
Bug:
17208457
Change-Id: I35555e0acf3b37bb3776a62c64d59ae93403b237
(cherry picked from commit
b894a19dfd668b6779de939cf5265b7e409d8809)
Ian Rogers [Fri, 22 Aug 2014 21:57:17 +0000 (21:57 +0000)]
am
1e4fbd8b: Merge "Using the correct time for wait_start_ms when lock contention logging is enabled" into lmp-dev
* commit '
1e4fbd8b7d65064d087c5afe812943b203ed205a':
Using the correct time for wait_start_ms when lock contention logging is enabled
Ian Rogers [Fri, 22 Aug 2014 21:48:42 +0000 (21:48 +0000)]
Merge "Using the correct time for wait_start_ms when lock contention logging is enabled" into lmp-dev
Xin Guan [Fri, 22 Aug 2014 16:55:37 +0000 (11:55 -0500)]
Using the correct time for wait_start_ms when lock contention logging is enabled
Bug:
17208457
Change-Id: I35555e0acf3b37bb3776a62c64d59ae93403b237
Andreas Gampe [Fri, 22 Aug 2014 20:45:58 +0000 (20:45 +0000)]
am
1dbc3a91: Merge "ART: Reject field accesses to non-reference vregs."
* commit '
1dbc3a918612e9ce01f8b05b5ef5f4cbb34e74d0':
ART: Reject field accesses to non-reference vregs.
Andreas Gampe [Fri, 22 Aug 2014 20:34:16 +0000 (20:34 +0000)]
Merge "ART: Reject field accesses to non-reference vregs."
Stephen Kyle [Fri, 22 Aug 2014 14:03:07 +0000 (15:03 +0100)]
ART: Reject field accesses to non-reference vregs.
The verifier will now reject any iget/iput insts
that do not have a reference object in vB.
Bug:
17207857
Change-Id: I2826f0f7abfc88561f4da9486588592f4b296d14
Signed-off-by: Stuart Monteith <stuart.monteith@arm.com>
Hiroshi Yamauchi [Fri, 22 Aug 2014 19:03:47 +0000 (19:03 +0000)]
am
19c62d5e: Merge "Handlerize MethodVerifier::mirror_method_."
* commit '
19c62d5e819519932aa7dff87a52f77815c64e65':
Handlerize MethodVerifier::mirror_method_.
Mathieu Chartier [Thu, 21 Aug 2014 19:21:48 +0000 (12:21 -0700)]
Fix GC memory overhead accounting.
There was some missing null checks.
Bug:
16238192
Change-Id: Iaf8d752db5f21e76f668c0066a063239ff374eee
Hiroshi Yamauchi [Fri, 22 Aug 2014 18:43:16 +0000 (18:43 +0000)]
Merge "Handlerize MethodVerifier::mirror_method_."
Hiroshi Yamauchi [Fri, 22 Aug 2014 18:13:12 +0000 (11:13 -0700)]
Handlerize MethodVerifier::mirror_method_.
The method (mirror_method_) wasn't handlerized across some
allocation/GC points such as the ResolveType() call in
ScanTryCatchBlocks() and the GetReturnType() calls in
CodeFlowVerifyInstruction().
Bug:
12687968
Change-Id: I95323de14459eb5a7c4abfcf44f882f86d59be64
Mathieu Chartier [Fri, 22 Aug 2014 17:53:49 +0000 (17:53 +0000)]
am
8e467728: Merge "Fix testing wrong variable for non zygote."
* commit '
8e4677287e9ddb6c9af5f2d0172681b2433e026d':
Fix testing wrong variable for non zygote.
Andreas Gampe [Fri, 22 Aug 2014 17:46:27 +0000 (10:46 -0700)]
resolved conflicts for merge of
16d03c4b to lmp-dev-plus-aosp
Change-Id: I2c698068bbf2e0b827d6dcb788619a0058f3f8c7
Mathieu Chartier [Fri, 22 Aug 2014 17:30:28 +0000 (17:30 +0000)]
Merge "Fix testing wrong variable for non zygote."
Calin Juravle [Fri, 22 Aug 2014 17:27:59 +0000 (17:27 +0000)]
am
6a56654f: Merge "Always setup the native bridge library"
* commit '
6a56654f8d0b6c58a41c39bba1acf9e88a973da8':
Always setup the native bridge library
Andreas Gampe [Fri, 22 Aug 2014 17:20:49 +0000 (17:20 +0000)]
am
1f8ea040: Merge "ART: Allow uninitialized runtime in oat code" into lmp-dev
* commit '
1f8ea0402915b394461bb6a3ca58e05c62f63082':
ART: Allow uninitialized runtime in oat code
Mathieu Chartier [Fri, 22 Aug 2014 01:28:20 +0000 (18:28 -0700)]
Fix testing wrong variable for non zygote.
For non zygote we want to only have a single non moving space to
let dex2oat use RosAlloc for all allocations.
Fixed stale low memory logic in parsed options.
Bug:
17189964
(cherry picked from commit
a12c2a945fe3f10d3ed31aa5db3e422cc1ad7f98)
Change-Id: I4fc00b277db6780ed410eab4cd969e8f004d5348
Andreas Gampe [Fri, 22 Aug 2014 17:14:12 +0000 (17:14 +0000)]
Merge "ART: Allow uninitialized runtime in oat code" into lmp-dev
Calin Juravle [Fri, 22 Aug 2014 17:12:13 +0000 (17:12 +0000)]
am
611b8b55: am
fd684f6d: Merge "Always setup the native bridge library" into lmp-dev
* commit '
611b8b55d7d3b6239849eeb37760a20d7246a173':
Always setup the native bridge library
Mathieu Chartier [Fri, 22 Aug 2014 17:12:13 +0000 (17:12 +0000)]
am
f734811d: am
84a9ba10: Merge "Fix testing wrong variable for non zygote." into lmp-dev
* commit '
f734811d3eb6b11f7b46eab2abad76eb7aa51357':
Fix testing wrong variable for non zygote.
Calin Juravle [Fri, 22 Aug 2014 17:12:00 +0000 (17:12 +0000)]
Merge "Always setup the native bridge library"
Calin Juravle [Fri, 22 Aug 2014 11:53:59 +0000 (12:53 +0100)]
Always setup the native bridge library
... even if the string is empty. This will initialize the native bridge
library but mark it as unavailable.
- also, rename native_bridge_library_path to
native_bridge_library_filename to be closer to the actual meaning (it's
just the filename without any path).
Bug:
16404669
(cherry picked from commit I94628639691459d48d1fbf0841f36b68d51818e7)
Change-Id: I94628639691459d48d1fbf0841f36b68d51818e7
Calin Juravle [Fri, 22 Aug 2014 17:00:29 +0000 (17:00 +0000)]
am
fd684f6d: Merge "Always setup the native bridge library" into lmp-dev
* commit '
fd684f6d51cf4bee6e7bf62c9d632fbebd7dd8b7':
Always setup the native bridge library
Mathieu Chartier [Fri, 22 Aug 2014 17:00:29 +0000 (17:00 +0000)]
am
84a9ba10: Merge "Fix testing wrong variable for non zygote." into lmp-dev
* commit '
84a9ba10a826b8480be53ea164fc6168544b2a48':
Fix testing wrong variable for non zygote.
Calin Juravle [Fri, 22 Aug 2014 16:55:31 +0000 (16:55 +0000)]
Merge "Always setup the native bridge library" into lmp-dev
Mathieu Chartier [Fri, 22 Aug 2014 16:48:58 +0000 (16:48 +0000)]
Merge "Fix testing wrong variable for non zygote." into lmp-dev
Mathieu Chartier [Fri, 22 Aug 2014 01:28:20 +0000 (18:28 -0700)]
Fix testing wrong variable for non zygote.
For non zygote we want to only have a single non moving space to
let dex2oat use RosAlloc for all allocations.
Fixed stale low memory logic in parsed options.
Bug:
17189964
Change-Id: I85a565002fd18ae30105df084796521abd60ea12
Ian Rogers [Fri, 22 Aug 2014 16:42:14 +0000 (16:42 +0000)]
am
a37ad7a6: Merge "GetDalvikDisassembly should work even without SSA info"
* commit '
a37ad7a6caad2e0a83c72c1103015202cbcaf1a4':
GetDalvikDisassembly should work even without SSA info
Ian Rogers [Fri, 22 Aug 2014 16:29:34 +0000 (16:29 +0000)]
am
954c7ea1: Merge "ART: Fix frontend to allow possibility of multiple code units"
* commit '
954c7ea1f72780510753524706111d1a2b26d9cb':
ART: Fix frontend to allow possibility of multiple code units
Ian Rogers [Fri, 22 Aug 2014 16:27:44 +0000 (16:27 +0000)]
Merge "GetDalvikDisassembly should work even without SSA info"