OSDN Git Service
Vladimir Marko [Mon, 1 Jun 2015 14:54:09 +0000 (15:54 +0100)]
resolved conflicts for merge of
a2ea7405 to mnc-dev-plus-aosp
Andreas Gampe [Mon, 1 Jun 2015 14:46:35 +0000 (14:46 +0000)]
am
c9d45055: Merge "ART: Add Mips o32 callee-save registers to SaveAll frame" into mnc-dev
* commit '
c9d450554eb7a8dd74e36698d736572fa57d1a7b':
ART: Add Mips o32 callee-save registers to SaveAll frame
Sebastien Hertz [Mon, 1 Jun 2015 10:55:57 +0000 (10:55 +0000)]
am
0f243e16: am
c2ec6287: Merge "Fix JDWP tests after ArtMethod change"
* commit '
0f243e16898dc91c2be2f7532959c4327857498f':
Fix JDWP tests after ArtMethod change
Vladimir Marko [Mon, 1 Jun 2015 10:55:56 +0000 (10:55 +0000)]
am
82bf4242: am
1f94058f: Merge "ART: Fix casts for 64-bit pointers on 32-bit compiler."
* commit '
82bf4242e8e3675f73ca4f586524892fcd3a61dc':
ART: Fix casts for 64-bit pointers on 32-bit compiler.
Sebastien Hertz [Mon, 1 Jun 2015 10:41:26 +0000 (10:41 +0000)]
am
c2ec6287: Merge "Fix JDWP tests after ArtMethod change"
* commit '
c2ec62874804f341439455fb00a128010139d0fc':
Fix JDWP tests after ArtMethod change
Vladimir Marko [Mon, 1 Jun 2015 10:41:24 +0000 (10:41 +0000)]
am
1f94058f: Merge "ART: Fix casts for 64-bit pointers on 32-bit compiler."
* commit '
1f94058f901ab5cd1a9870d45ff29b9d5d0a8802':
ART: Fix casts for 64-bit pointers on 32-bit compiler.
Sebastien Hertz [Mon, 1 Jun 2015 10:31:09 +0000 (10:31 +0000)]
Merge "Fix JDWP tests after ArtMethod change"
Vladimir Marko [Mon, 1 Jun 2015 10:27:36 +0000 (10:27 +0000)]
Merge "ART: Fix casts for 64-bit pointers on 32-bit compiler."
Sebastien Hertz [Mon, 1 Jun 2015 09:42:27 +0000 (11:42 +0200)]
Fix JDWP tests after ArtMethod change
Fixes Throwable::GetStackDepth for exception event detection after
internal stack trace representation change.
Adds missing ArtMethod::GetInterfaceMethodIfProxy call in case of
proxy method.
Bug:
19264997
Change-Id: I363e293796848c3ec491c963813f62d868da44d2
Vladimir Marko [Mon, 1 Jun 2015 10:02:59 +0000 (11:02 +0100)]
ART: Fix casts for 64-bit pointers on 32-bit compiler.
Bug:
19264997
Change-Id: Ief45cdd4bae5a43fc8bfdfa7cf744e2c57529457
Mathieu Chartier [Mon, 1 Jun 2015 05:47:00 +0000 (05:47 +0000)]
am
ea2b7625: am
a96bea54: Merge "Fix some ArtMethod related bugs"
* commit '
ea2b7625af2b4d76a165e7aa80efd7574f185f49':
Fix some ArtMethod related bugs
Mathieu Chartier [Mon, 1 Jun 2015 05:32:42 +0000 (05:32 +0000)]
am
a96bea54: Merge "Fix some ArtMethod related bugs"
* commit '
a96bea54b7e3def5490d169f2bf92be2e68dd001':
Fix some ArtMethod related bugs
Mathieu Chartier [Mon, 1 Jun 2015 05:22:48 +0000 (05:22 +0000)]
Merge "Fix some ArtMethod related bugs"
Mathieu Chartier [Sun, 31 May 2015 21:29:23 +0000 (14:29 -0700)]
Fix some ArtMethod related bugs
Added root visiting for runtime methods, not currently required
since the GcRoots in these methods are null.
Added missing GetInterfaceMethodIfProxy in GetMethodLine, fixes
--trace run-tests 005, 044.
Fixed optimizing compiler bug where we used a normal stack location
instead of double on ARM64, this fixes the debuggable tests.
TODO: Fix JDWP tests.
Bug:
19264997
Change-Id: I7c55f69c61d1b45351fd0dc7185ffe5efad82bd3
Andreas Gampe [Mon, 1 Jun 2015 00:15:05 +0000 (00:15 +0000)]
am
dd69dcb6: am
442dd37d: Merge "Fix test 115-native-bridge for Mips."
* commit '
dd69dcb6da57cfd07d821339a4721f635d763139':
Fix test 115-native-bridge for Mips.
Andreas Gampe [Mon, 1 Jun 2015 00:00:42 +0000 (00:00 +0000)]
am
442dd37d: Merge "Fix test 115-native-bridge for Mips."
* commit '
442dd37d27b44ab4f86be3a8ec26afedbfe911f9':
Fix test 115-native-bridge for Mips.
Andreas Gampe [Sun, 31 May 2015 23:50:26 +0000 (23:50 +0000)]
Merge "Fix test 115-native-bridge for Mips."
Douglas Leung [Sat, 30 May 2015 02:50:02 +0000 (19:50 -0700)]
Fix test 115-native-bridge for Mips.
Change-Id: I3eee8df39e774d233f11c43a5578f407bfdebca1
Mathieu Chartier [Sat, 30 May 2015 02:21:00 +0000 (02:21 +0000)]
am
0efe6490: am
119a8025: Merge "Move mirror::ArtMethod to native"
* commit '
0efe64909fe9e1162079d7091078da13f51da6da':
Move mirror::ArtMethod to native
Mathieu Chartier [Sat, 30 May 2015 02:05:02 +0000 (02:05 +0000)]
am
119a8025: Merge "Move mirror::ArtMethod to native"
* commit '
119a8025bbc1c6f4a2d537e9a6d22f33ef31e552':
Move mirror::ArtMethod to native
Mathieu Chartier [Sat, 30 May 2015 01:54:15 +0000 (01:54 +0000)]
Merge "Move mirror::ArtMethod to native"
Mathieu Chartier [Wed, 22 Apr 2015 20:56:20 +0000 (13:56 -0700)]
Move mirror::ArtMethod to native
Optimizing + quick tests are passing, devices boot.
TODO: Test and fix bugs in mips64.
Saves 16 bytes per most ArtMethod, 7.5MB reduction in system PSS.
Some of the savings are from removal of virtual methods and direct
methods object arrays.
Bug:
19264997
Change-Id: I622469a0cfa0e7082a2119f3d6a9491eb61e3f3d
Jeff Hao [Fri, 29 May 2015 23:07:44 +0000 (23:07 +0000)]
am
a05c0db9: am
2006b7b9: Merge "Add unstarted runtime test for String.<init>."
* commit '
a05c0db93e63719c4b59d75d559e068c3bc6bcc0':
Add unstarted runtime test for String.<init>.
Jeff Hao [Fri, 29 May 2015 22:52:46 +0000 (22:52 +0000)]
am
2006b7b9: Merge "Add unstarted runtime test for String.<init>."
* commit '
2006b7b9b8e32722bd0d640c62549d8a0ac624b6':
Add unstarted runtime test for String.<init>.
Jeff Hao [Fri, 29 May 2015 22:40:31 +0000 (22:40 +0000)]
Merge "Add unstarted runtime test for String.<init>."
Jeff Hao [Fri, 29 May 2015 17:53:17 +0000 (10:53 -0700)]
Add unstarted runtime test for String.<init>.
Bug:
21173514
(cherry picked from commit
73a937740841154eb32a0aa15f938f1c06f26091)
Change-Id: If7bd360c396e2594f34efe3a6237f77c7129112b
David Srbecky [Fri, 29 May 2015 20:20:13 +0000 (20:20 +0000)]
am
ec723892: am
03663443: Merge "Make some parts of ELF more (pointer) aligned."
* commit '
ec723892a0411dd6bdc9df00728a44d3ed8e13ad':
Make some parts of ELF more (pointer) aligned.
David Srbecky [Fri, 29 May 2015 20:00:30 +0000 (20:00 +0000)]
am
03663443: Merge "Make some parts of ELF more (pointer) aligned."
* commit '
0366344363c66138e5cfbac6de12cdbb3ac5c76e':
Make some parts of ELF more (pointer) aligned.
David Srbecky [Fri, 29 May 2015 19:48:19 +0000 (19:48 +0000)]
Merge "Make some parts of ELF more (pointer) aligned."
Vladimir Marko [Fri, 8 May 2015 11:26:59 +0000 (12:26 +0100)]
Fix double-exception in super-class method validation.
Bug:
19333589
(cherry picked from commit
d5e5a0e61b5b1fe0aaa7edc25a08adebd5a92353)
Change-Id: If394a678ef6271c1119dac3f959773f23e789c56
David Srbecky [Fri, 29 May 2015 17:09:05 +0000 (18:09 +0100)]
Make some parts of ELF more (pointer) aligned.
I am not aware of any problem at the moment, but better
be safe than sorry. I have noticed that we align less
when comparing our output with output of other tools.
Bug:
20556771
Change-Id: I904e66f5b7776f64cc90ec2802ddb2c630b64d08
Vladimir Marko [Fri, 29 May 2015 17:04:39 +0000 (17:04 +0000)]
am
c2e6edc0: am
75939a2b: Merge "Fix double-exception in super-class method validation."
* commit '
c2e6edc05feaaf2376c21c20a35ca4c1aa836930':
Fix double-exception in super-class method validation.
Vladimir Marko [Fri, 29 May 2015 16:53:24 +0000 (16:53 +0000)]
am
75939a2b: Merge "Fix double-exception in super-class method validation."
* commit '
75939a2ba24ca4da3f33f89928cca1540c5ddfc6':
Fix double-exception in super-class method validation.
Vladimir Marko [Fri, 29 May 2015 16:44:07 +0000 (16:44 +0000)]
Merge "Fix double-exception in super-class method validation."
David Srbecky [Fri, 29 May 2015 16:40:16 +0000 (16:40 +0000)]
am
283891a0: am
6cce3c9d: Merge "Link .dynamic to .dynstr"
* commit '
283891a0ac48732941fa10553e96e924e22841e7':
Link .dynamic to .dynstr
David Srbecky [Fri, 29 May 2015 16:40:15 +0000 (16:40 +0000)]
am
17ff437b: am
49c595d7: Merge "Set correct size of PT_PHDR ELF segment."
* commit '
17ff437b2596e4bc4098b75a54fc0bd87f9d7769':
Set correct size of PT_PHDR ELF segment.
David Srbecky [Fri, 29 May 2015 16:26:30 +0000 (16:26 +0000)]
am
6cce3c9d: Merge "Link .dynamic to .dynstr"
* commit '
6cce3c9d4219f1d45de9dd2af86f860c42af0a78':
Link .dynamic to .dynstr
David Srbecky [Fri, 29 May 2015 16:26:28 +0000 (16:26 +0000)]
am
49c595d7: Merge "Set correct size of PT_PHDR ELF segment."
* commit '
49c595d7341ee1d6b4bdc05ca2437c61c726cbbf':
Set correct size of PT_PHDR ELF segment.
David Srbecky [Fri, 29 May 2015 16:18:06 +0000 (16:18 +0000)]
Merge "Link .dynamic to .dynstr"
David Srbecky [Fri, 29 May 2015 16:16:55 +0000 (16:16 +0000)]
Merge "Set correct size of PT_PHDR ELF segment."
David Srbecky [Fri, 29 May 2015 15:33:11 +0000 (16:33 +0100)]
Link .dynamic to .dynstr
This is what the ELF specification says we should do.
(see Figure 1-13: sh_link and sh_info Interpretation)
Also make the entity size of string sections 0 (i.e. not a table).
Size 1 makes some sense as well but it is not what other tools do.
Bug:
20556771
Change-Id: I780ba2e13c09c33c143fca70b38a35f3b8528fb2
David Srbecky [Fri, 29 May 2015 14:21:20 +0000 (15:21 +0100)]
Set correct size of PT_PHDR ELF segment.
This is just a nit pick, I do not believe that having it too
long could have caused any trouble since the correct number of
elements is stored in ELF header and extra space was zero padded.
Bug:
20556771
Change-Id: Ide56e6aa40f9b7175b55a830caf34c47e48213af
Andreas Gampe [Fri, 29 May 2015 15:49:47 +0000 (15:49 +0000)]
am
83fc910a: am
0028b9d3: Merge "ART: Add support for special handlers in sigchainlib"
* commit '
83fc910a2f5e259233c5e627c2e3ae8de62e8426':
ART: Add support for special handlers in sigchainlib
Andreas Gampe [Fri, 29 May 2015 15:35:37 +0000 (15:35 +0000)]
am
0028b9d3: Merge "ART: Add support for special handlers in sigchainlib"
* commit '
0028b9d3b7d73ba0a045d50a0fe2797e51a4e6b6':
ART: Add support for special handlers in sigchainlib
Andreas Gampe [Fri, 29 May 2015 15:26:21 +0000 (15:26 +0000)]
Merge "ART: Add support for special handlers in sigchainlib"
Nicolas Geoffray [Fri, 29 May 2015 14:20:25 +0000 (14:20 +0000)]
am
9fcfdd82: am
66a7d7a4: Merge "Support for inlining methods that call/throw."
* commit '
9fcfdd82182f8d8811afcad1d2c484708b0d60ef':
Support for inlining methods that call/throw.
Roland Levillain [Fri, 29 May 2015 14:20:24 +0000 (14:20 +0000)]
am
15c2b109: am
bd699ea0: Merge "Bring Reference Type Propagation to Instance/StaticInstanceField"
* commit '
15c2b10929240cc66ea00947eba38b561abdd6f6':
Bring Reference Type Propagation to Instance/StaticInstanceField
Nicolas Geoffray [Fri, 29 May 2015 14:06:47 +0000 (14:06 +0000)]
am
66a7d7a4: Merge "Support for inlining methods that call/throw."
* commit '
66a7d7a4612b0dfb8a409fbf05bbefd07122fd80':
Support for inlining methods that call/throw.
Roland Levillain [Fri, 29 May 2015 14:06:45 +0000 (14:06 +0000)]
am
bd699ea0: Merge "Bring Reference Type Propagation to Instance/StaticInstanceField"
* commit '
bd699ea018d12b061282f17a6abf329590ab263c':
Bring Reference Type Propagation to Instance/StaticInstanceField
Nicolas Geoffray [Fri, 29 May 2015 14:03:10 +0000 (14:03 +0000)]
Merge "Support for inlining methods that call/throw."
Roland Levillain [Fri, 29 May 2015 13:57:36 +0000 (13:57 +0000)]
Merge "Bring Reference Type Propagation to Instance/StaticInstanceField"
Nicolas Geoffray [Fri, 29 May 2015 13:24:01 +0000 (13:24 +0000)]
am
c34990e2: am
05f763b8: Merge "Also add run-test dependencies to build-art-*-tests."
* commit '
c34990e2ea69f81b0784c308c53a42c0437d034f':
Also add run-test dependencies to build-art-*-tests.
Nicolas Geoffray [Mon, 18 May 2015 21:31:29 +0000 (22:31 +0100)]
Support for inlining methods that call/throw.
Mostly fixes here and there to make it working.
Change-Id: I1b535e895105d78b65634636d675b818551f783e
Nicolas Geoffray [Fri, 29 May 2015 13:09:12 +0000 (13:09 +0000)]
am
be2302a6: am
a15c78d3: Merge "Use the new HCurrentMethod in HLoadString."
* commit '
be2302a6e256bc1623a27dc9e4348e85e5354b12':
Use the new HCurrentMethod in HLoadString.
Nicolas Geoffray [Fri, 29 May 2015 13:08:55 +0000 (13:08 +0000)]
am
05f763b8: Merge "Also add run-test dependencies to build-art-*-tests."
* commit '
05f763b892c1fea61428752aa5576f4f656a6463':
Also add run-test dependencies to build-art-*-tests.
Nicolas Geoffray [Fri, 29 May 2015 12:55:54 +0000 (12:55 +0000)]
Merge "Also add run-test dependencies to build-art-*-tests."
Nicolas Geoffray [Fri, 29 May 2015 12:55:31 +0000 (12:55 +0000)]
am
a15c78d3: Merge "Use the new HCurrentMethod in HLoadString."
* commit '
a15c78d3cc28f514a482ffd792a767e97fe53c95':
Use the new HCurrentMethod in HLoadString.
Nicolas Geoffray [Fri, 29 May 2015 12:43:13 +0000 (12:43 +0000)]
Merge "Use the new HCurrentMethod in HLoadString."
Nicolas Geoffray [Fri, 29 May 2015 12:40:25 +0000 (13:40 +0100)]
Also add run-test dependencies to build-art-*-tests.
Change-Id: If02c1a9426c2d04f4fad8892e387b2fb6c48ee2f
Nicolas Geoffray [Fri, 29 May 2015 11:46:15 +0000 (11:46 +0000)]
am
72518837: am
5adb8b6b: Merge "Fix typo in script."
* commit '
725188372e5e2f272827d1a0a4e58ccd45cb839f':
Fix typo in script.
Nicolas Geoffray [Fri, 29 May 2015 11:31:28 +0000 (11:31 +0000)]
am
d91f8b2c: am
1a0bd725: Merge "Update libcore failures"
* commit '
d91f8b2c4431b0ab55c1df412ddcd8bf0a59e3c2':
Update libcore failures
Nicolas Geoffray [Fri, 29 May 2015 11:30:55 +0000 (11:30 +0000)]
am
5adb8b6b: Merge "Fix typo in script."
* commit '
5adb8b6b3c7e97b94a2b28258847b947895faeea':
Fix typo in script.
Nicolas Geoffray [Fri, 29 May 2015 11:20:12 +0000 (11:20 +0000)]
Merge "Fix typo in script."
Nicolas Geoffray [Fri, 29 May 2015 11:17:47 +0000 (11:17 +0000)]
am
1a0bd725: Merge "Update libcore failures"
* commit '
1a0bd72563a525dbb5d2a06f818ec7113dcf67c1':
Update libcore failures
Nicolas Geoffray [Fri, 29 May 2015 11:17:06 +0000 (12:17 +0100)]
Fix typo in script.
Change-Id: I853bb5758005f9f7c4940f815c3d72a1d48acd21
Nicolas Geoffray [Fri, 29 May 2015 11:06:56 +0000 (12:06 +0100)]
Use the new HCurrentMethod in HLoadString.
Change-Id: I23d27e5e10736d127519eb3238ff8f25df3843a2
Nicolas Geoffray [Fri, 29 May 2015 11:04:07 +0000 (11:04 +0000)]
am
b81873de: am
fa2d9424: Merge "Add a script to build exactly like the chrome buildbot."
* commit '
b81873de876a58ecfa64547951f2b1c21940335d':
Add a script to build exactly like the chrome buildbot.
Nicolas Geoffray [Fri, 29 May 2015 11:03:52 +0000 (11:03 +0000)]
Merge "Update libcore failures"
Wojciech Staszkiewicz [Fri, 29 May 2015 10:12:59 +0000 (11:12 +0100)]
Update libcore failures
Default device date (1970) is causing some tests to fail. This
change updates libcore failures to reflect this knowledge.
Change-Id: Ia8151cfa1600fba4b45c203d468de9244b322d61
Nicolas Geoffray [Fri, 29 May 2015 10:50:44 +0000 (10:50 +0000)]
am
fa2d9424: Merge "Add a script to build exactly like the chrome buildbot."
* commit '
fa2d94249871261c973b9c9f3827c494fe270f61':
Add a script to build exactly like the chrome buildbot.
Guillaume "Vermeille" Sanchez [Wed, 20 May 2015 16:52:13 +0000 (17:52 +0100)]
Bring Reference Type Propagation to Instance/StaticInstanceField
For this, we need the field index in FieldInfo, hence the add of the field.
Change-Id: Id219bd826d8496acf3981307a8c42e2eb6ddb712
Nicolas Geoffray [Fri, 29 May 2015 10:41:40 +0000 (10:41 +0000)]
Merge "Add a script to build exactly like the chrome buildbot."
Nicolas Geoffray [Fri, 29 May 2015 09:54:12 +0000 (10:54 +0100)]
Add a script to build exactly like the chrome buildbot.
The buildbot will use that script directly.
Change-Id: I837432f1e1e9b9d238d91de9af51ad955f7cd76d
Vladimir Marko [Fri, 8 May 2015 11:26:59 +0000 (12:26 +0100)]
Fix double-exception in super-class method validation.
Bug:
19333589
Change-Id: I2399c4058d488bbdbf6709c63e367f1b7c251b1d
Andreas Gampe [Fri, 29 May 2015 03:44:42 +0000 (03:44 +0000)]
am
7484c320: am
25e447d5: Merge "ART: Fix valgrind Makefile"
* commit '
7484c320e1436f09dcf532040c3cbaed0643910e':
ART: Fix valgrind Makefile
Andreas Gampe [Fri, 29 May 2015 03:29:58 +0000 (03:29 +0000)]
am
25e447d5: Merge "ART: Fix valgrind Makefile"
* commit '
25e447d53cf4e7ca087c8ac77df11acddb595564':
ART: Fix valgrind Makefile
Andreas Gampe [Fri, 29 May 2015 03:18:25 +0000 (03:18 +0000)]
Merge "ART: Fix valgrind Makefile"
Andreas Gampe [Fri, 29 May 2015 03:17:09 +0000 (20:17 -0700)]
ART: Fix valgrind Makefile
Add a missing dependency that lead to runtime errors.
Change-Id: Idbaed6bcc56a644713f10847f8600dc0f962202f
Andreas Gampe [Fri, 29 May 2015 01:06:38 +0000 (01:06 +0000)]
am
e44afa21: am
33601370: Merge "ART: Add Mips o32 callee-save registers to SaveAll frame"
* commit '
e44afa21e00a7ad645652a8784c55fa4da7f1c48':
ART: Add Mips o32 callee-save registers to SaveAll frame
Andreas Gampe [Fri, 29 May 2015 00:57:53 +0000 (00:57 +0000)]
am
33601370: Merge "ART: Add Mips o32 callee-save registers to SaveAll frame"
* commit '
336013702f77a0abdc56a90ef75d88264f6247b6':
ART: Add Mips o32 callee-save registers to SaveAll frame
Andreas Gampe [Fri, 29 May 2015 00:49:39 +0000 (00:49 +0000)]
Merge "ART: Add Mips o32 callee-save registers to SaveAll frame" into mnc-dev
Andreas Gampe [Thu, 28 May 2015 01:31:42 +0000 (18:31 -0700)]
ART: Add Mips o32 callee-save registers to SaveAll frame
The floating point registers f20-f31 are callee-save in the Mips
ABI. While the managed code does not touch them, they need to be
saved when throwing an exception, so that they will be correctly
restored and not smashed.
Bug:
21266656
(cherry picked from commit
a4e0e67611f54180694e0807d6599c1132269b6c)
Change-Id: Ia96d52ce7fb41bf604da1797ce4d7a703e292415
Andreas Gampe [Fri, 29 May 2015 00:47:42 +0000 (00:47 +0000)]
Merge "ART: Add Mips o32 callee-save registers to SaveAll frame"
Jeff Hao [Fri, 29 May 2015 00:28:44 +0000 (00:28 +0000)]
am
7be83025: Add JNI String.<init> test for global and weak global refs.
* commit '
7be83025b62ab499ed8b2b59521f8fbe8e2b13ab':
Add JNI String.<init> test for global and weak global refs.
Jeff Hao [Fri, 29 May 2015 00:05:00 +0000 (00:05 +0000)]
am
93c591f6: am
78011df8: Merge "Add JNI String.<init> test for global and weak global refs."
* commit '
93c591f694c45feed6f7ea0fbc159bdc27476077':
Add JNI String.<init> test for global and weak global refs.
Jeff Hao [Fri, 29 May 2015 00:04:57 +0000 (00:04 +0000)]
am
882ff6d2: am
24c24d43: Merge "Fix updating of JNI references for String.<init>."
* commit '
882ff6d23d86d16fef938a2503ec4d5af78d9dd0':
Fix updating of JNI references for String.<init>.
Jeff Hao [Thu, 28 May 2015 23:12:31 +0000 (23:12 +0000)]
am
78011df8: Merge "Add JNI String.<init> test for global and weak global refs."
* commit '
78011df89ac172d25f337132386c2a284b34dfdd':
Add JNI String.<init> test for global and weak global refs.
Jeff Hao [Thu, 28 May 2015 23:12:30 +0000 (23:12 +0000)]
am
24c24d43: Merge "Fix updating of JNI references for String.<init>."
* commit '
24c24d43f53224bf41a41eb214c5256dda93668d':
Fix updating of JNI references for String.<init>.
Jeff Hao [Thu, 28 May 2015 22:50:19 +0000 (22:50 +0000)]
Merge "Add JNI String.<init> test for global and weak global refs."
Jeff Hao [Thu, 28 May 2015 21:32:07 +0000 (14:32 -0700)]
Add JNI String.<init> test for global and weak global refs.
Test for change:
https://android-review.googlesource.com/#/c/152265/
(cherry picked from commit
7be83025b62ab499ed8b2b59521f8fbe8e2b13ab)
Change-Id: If10a5fcf7a554d798d2bb21d493e5a7266ed0079
Jeff Hao [Thu, 28 May 2015 22:47:58 +0000 (22:47 +0000)]
Merge "Fix updating of JNI references for String.<init>."
Jeff Hao [Thu, 28 May 2015 21:32:07 +0000 (14:32 -0700)]
Add JNI String.<init> test for global and weak global refs.
Test for change:
https://googleplex-android-review.git.corp.google.com/#/c/698642/
Change-Id: I3e1182d42f9e24448d8616000de58ebfe1e50fb8
David Srbecky [Thu, 28 May 2015 20:16:51 +0000 (20:16 +0000)]
am
2edc211c: am
023e6f6d: Merge "Add --generate-debug-info flag and remove the other two flags."
* commit '
2edc211c4520ea5d9219372554adbc3822c844b6':
Add --generate-debug-info flag and remove the other two flags.
David Srbecky [Thu, 28 May 2015 18:53:23 +0000 (18:53 +0000)]
am
023e6f6d: Merge "Add --generate-debug-info flag and remove the other two flags."
* commit '
023e6f6d67d6ab520e194d142f3adaafb6e3a11d':
Add --generate-debug-info flag and remove the other two flags.
Andreas Gampe [Sat, 23 May 2015 01:31:50 +0000 (18:31 -0700)]
ART: Add support for special handlers in sigchainlib
Add support for a special managed handler in sigchainlib that
will be called as the first user handler.
Use this support for native bridge v2. Extend test 115-native-bridge
to test the functionality.
Bug:
20217701
Change-Id: I78cc01fbdabe169154ff6b94c9f3ddb95b5c7448
David Srbecky [Thu, 28 May 2015 18:37:35 +0000 (18:37 +0000)]
Merge "Add --generate-debug-info flag and remove the other two flags."
David Brazdil [Thu, 28 May 2015 17:19:35 +0000 (17:19 +0000)]
am
4d5620d1: am
6f84e504: Merge "ART: Distinguish Checker lines from comments"
* commit '
4d5620d145193d215039be8416529232c3c1d95f':
ART: Distinguish Checker lines from comments
Nicolas Geoffray [Thu, 28 May 2015 17:19:27 +0000 (17:19 +0000)]
am
b4a32d75: am
b4e2fbbe: Merge "Add a HCurrentMethod node."
* commit '
b4a32d75ef7d1135e12d188d1902e2e9cd9afd37':
Add a HCurrentMethod node.
Sebastien Hertz [Thu, 28 May 2015 17:19:26 +0000 (17:19 +0000)]
am
3fd2a9e1: am
31db3432: Merge "Fix single-step in native thread"
* commit '
3fd2a9e15b6612921f021b4828178a4939763ce0':
Fix single-step in native thread
Nicolas Geoffray [Thu, 28 May 2015 17:19:24 +0000 (17:19 +0000)]
am
07e55816: am
2b2288f2: Merge "Fix rule: the exe must be first dependency."
* commit '
07e55816b5bb4a8024702a9978e3cafd6f95d54d':
Fix rule: the exe must be first dependency.