OSDN Git Service
Andreas Gampe [Mon, 26 Sep 2016 23:42:05 +0000 (23:42 +0000)]
Merge "ART: Fix dependencies" am:
fdaa803ba3
am:
08d19ced93
Change-Id: If43b0ff029ded7844511a3ba0a06276f83be0a49
Andreas Gampe [Mon, 26 Sep 2016 23:38:36 +0000 (23:38 +0000)]
Merge "ART: Fix dependencies"
am:
fdaa803ba3
Change-Id: Ib7bbf19b3ed243120c8bd5e45e3bb3a23b3ce330
Andreas Gampe [Mon, 26 Sep 2016 23:26:51 +0000 (23:26 +0000)]
Merge "ART: Fix dependencies"
Andreas Gampe [Mon, 26 Sep 2016 23:13:34 +0000 (23:13 +0000)]
Merge "ART: Revert base/logging conditional hacks" am:
42c49d236c
am:
19ad7b889f
Change-Id: I5338ccb2353dcc1f0025b916f295d1030b825fe7
Andreas Gampe [Mon, 26 Sep 2016 23:07:32 +0000 (23:07 +0000)]
Merge "ART: Revert base/logging conditional hacks"
am:
42c49d236c
Change-Id: I0cb701ab52fb3047360bc96097e47b0806f90f64
Treehugger Robot [Mon, 26 Sep 2016 23:00:02 +0000 (23:00 +0000)]
Merge "ART: Revert base/logging conditional hacks"
Andreas Gampe [Mon, 26 Sep 2016 22:56:32 +0000 (22:56 +0000)]
Merge "ART: Fix nits" am:
cda79e87e0
am:
b2b9d390c1
Change-Id: I97762fd8c1e6a5657096dbc3b60cdb5597089514
Andreas Gampe [Mon, 26 Sep 2016 22:52:31 +0000 (22:52 +0000)]
Merge "ART: Fix nits"
am:
cda79e87e0
Change-Id: Ie552080275f58b1354f47fefbc3d5a06e6eb65f5
Treehugger Robot [Mon, 26 Sep 2016 22:48:55 +0000 (22:48 +0000)]
Merge "ART: Fix nits"
Wojciech Staszkiewicz [Mon, 26 Sep 2016 21:55:13 +0000 (21:55 +0000)]
Merge "Implement nightly jfuzz test runner" am:
25243492bf
am:
5188ae322f
Change-Id: I30a148443e2ac6d47438978657e8562bf9473a29
Wojciech Staszkiewicz [Mon, 26 Sep 2016 21:52:05 +0000 (21:52 +0000)]
Merge "Implement nightly jfuzz test runner"
am:
25243492bf
Change-Id: If37fa2111a9709e7c21f308539d7a7faa4c901ed
Treehugger Robot [Mon, 26 Sep 2016 21:42:08 +0000 (21:42 +0000)]
Merge "Implement nightly jfuzz test runner"
Andreas Gampe [Mon, 26 Sep 2016 21:18:25 +0000 (14:18 -0700)]
ART: Fix dependencies
Add libbase as a dependency to libartbenchmark.
Bug:
31338270
Test: m test-art-host
Change-Id: I23c9f4219710fd8b5691837c5bc197b993aafe7b
Andreas Gampe [Mon, 26 Sep 2016 21:07:57 +0000 (14:07 -0700)]
ART: Fix nits
Follow-up to commit
3fec9ac0d5af1358d216eb2fdc2000ec0205f3f0.
Bug:
31338270
Test: m test-art-host
Change-Id: Ia50f450bef144167b946224c26242c529302996e
Igor Murashkin [Mon, 26 Sep 2016 20:00:36 +0000 (20:00 +0000)]
Merge "jni: Punt to generic JNI for mips" am:
20426c3403
am:
4fdca0e7fc
Change-Id: Ie5b3bb6860a535ef6fe015a85a9eeafae343d390
Andreas Gampe [Mon, 26 Sep 2016 20:00:21 +0000 (20:00 +0000)]
Merge "ART: Use libbase logging" am:
a4850b0fa1
am:
fb7380297e
Change-Id: I21d20bd9d5b06045898f6c4395ffaeac0b32b501
Igor Murashkin [Mon, 26 Sep 2016 19:56:36 +0000 (19:56 +0000)]
Merge "jni: Punt to generic JNI for mips"
am:
20426c3403
Change-Id: I078b4bdafdd14b9e2876db26c2a5a2d7d2ea550f
Andreas Gampe [Mon, 26 Sep 2016 19:56:19 +0000 (19:56 +0000)]
Merge "ART: Use libbase logging"
am:
a4850b0fa1
Change-Id: Id19ac0187a9213fe6b2bd2135f994e60e772dc90
Andreas Gampe [Mon, 26 Sep 2016 19:51:53 +0000 (12:51 -0700)]
ART: Revert base/logging conditional hacks
This partially reverts commit
bda1d606f2d31086874b68edd9254e3817d8049c.
ART was switched to libbase logging.
Bug:
31338270
Test: m test-art-host
Change-Id: I1a2f90d1ddb67d45ebe28d970b3ee7fd2d16a730
Treehugger Robot [Mon, 26 Sep 2016 19:53:37 +0000 (19:53 +0000)]
Merge "jni: Punt to generic JNI for mips"
Wojciech Staszkiewicz [Sat, 24 Sep 2016 00:41:27 +0000 (17:41 -0700)]
Implement nightly jfuzz test runner
New script runs multiple instances of run_jfuzz_test.py and has
predefined arguments suitable for nightly runs.
Test: ./run_jfuzz_test_nightly.py
Change-Id: I8c0060d72c69bbdf88571a9272f2d3fef74697eb
Treehugger Robot [Mon, 26 Sep 2016 19:45:22 +0000 (19:45 +0000)]
Merge "ART: Use libbase logging"
Andreas Gampe [Tue, 13 Sep 2016 17:47:28 +0000 (10:47 -0700)]
ART: Use libbase logging
Move most of our logging infrastructure over to system/core/base.
Retain VLOG.
Using unified Android infrastructure has two main advantages. First,
it reduces the complexity/maintenance burden in ART. Second, it
allows to detach logging for the cases where we do not want or need
a runtime, e.g., dexdump, the disassembler, etc. As a part of the
latter, libbase is also supported for all hosts (including Windows).
From a developer viewpoint, there are minor behavior changes for the
LOG statements (see above), but otherwise usage is the same. Explicit
severity enum items are in the android::base namespace now.
Bug:
31338270
Test: m test-art-host
Change-Id: I5abcb2f45f5b03d49951874c48544f72a283a91b
Igor Murashkin [Mon, 26 Sep 2016 17:10:17 +0000 (10:10 -0700)]
jni: Punt to generic JNI for mips
Preopting dex the bootclasspath causes dex2oat to crash for MIPS builds.
Disable JNI compiler for MIPS until it supports @CriticalNative.
Test: lunch aosp_mips-eng && make && make test-art-host
Bug:
31743474
Change-Id: I802f1e61863c4bb54a1bd884a4c9ce9a75bab62b
David Sehr [Mon, 26 Sep 2016 14:44:57 +0000 (14:44 +0000)]
Merge "Fix CTS crash from DexFile refactoring" am:
0cfe19af3b
am:
6bfb9db272
Change-Id: I786f510874db68a794bd9e01632dc2012257752d
David Sehr [Mon, 26 Sep 2016 14:42:26 +0000 (14:42 +0000)]
Merge "Fix CTS crash from DexFile refactoring"
am:
0cfe19af3b
Change-Id: Ifd5c3e906c3175ba25dc179d6378be0f1aa80c84
David Sehr [Mon, 26 Sep 2016 14:34:49 +0000 (14:34 +0000)]
Merge "Fix CTS crash from DexFile refactoring"
Nicolas Geoffray [Mon, 26 Sep 2016 12:48:19 +0000 (12:48 +0000)]
Merge "Compensate in compiler for verifier shortcomings." am:
3cc69a8944
am:
b4907a888a
Change-Id: I969890a313fe82ce31a503990a176140daac1a03
Nicolas Geoffray [Mon, 26 Sep 2016 12:45:49 +0000 (12:45 +0000)]
Merge "Compensate in compiler for verifier shortcomings."
am:
3cc69a8944
Change-Id: I7b485879dbaee0feea345d2834fef348405eec83
Treehugger Robot [Mon, 26 Sep 2016 12:39:16 +0000 (12:39 +0000)]
Merge "Compensate in compiler for verifier shortcomings."
Nicolas Geoffray [Fri, 23 Sep 2016 14:40:41 +0000 (15:40 +0100)]
Compensate in compiler for verifier shortcomings.
The verifier does not differentiate zero and null, so a move-object
of zero can be used as a non-object later on.
Change the compiler to ignore the object conversion when the input
is zero or a phi (which might just hold zeros). The type propagation
will then do proper inferencing of the types.
Also remove some stalled comments in ssa_builder.cc.
bug:
31313170
test: dex2oat
b31313170.apk
test: run-test 800
test: m test-art-host-run-test
Change-Id: I579d667415a7decf8ff2c2238dae4c13eec5d0e0
Sebastien Hertz [Mon, 26 Sep 2016 07:16:26 +0000 (07:16 +0000)]
Merge "Add DCE check to test 458-checker-instruct-simplification" am:
a1d66b9050
am:
da2e93a8c2
Change-Id: Iae23a72f1acd13c99b79bb22768629702f592522
Sebastien Hertz [Mon, 26 Sep 2016 07:13:56 +0000 (07:13 +0000)]
Merge "Add DCE check to test 458-checker-instruct-simplification"
am:
a1d66b9050
Change-Id: Ib44b71f95409e604f7c73ed68c1d8df0b39b853f
Sebastien Hertz [Mon, 26 Sep 2016 07:09:43 +0000 (07:09 +0000)]
Merge "Add DCE check to test 458-checker-instruct-simplification"
Dimitry Ivanov [Sat, 24 Sep 2016 01:38:42 +0000 (01:38 +0000)]
Merge "Use liblog for liblog (instead of libcutils)" am:
ad1f0ad512
am:
d0d94c01b2
Change-Id: I47fa72f1731dc517bdaed189ab2c22617d1ac356
Dimitry Ivanov [Sat, 24 Sep 2016 01:36:43 +0000 (01:36 +0000)]
Merge "Use liblog for liblog (instead of libcutils)"
am:
ad1f0ad512
Change-Id: Ifdfc800cfba522e9bf9465682f435935702f8f06
Treehugger Robot [Sat, 24 Sep 2016 01:31:25 +0000 (01:31 +0000)]
Merge "Use liblog for liblog (instead of libcutils)"
Mathieu Chartier [Sat, 24 Sep 2016 00:46:10 +0000 (00:46 +0000)]
Merge "Smarter image layout" am:
48ec36f8a0
am:
0b67da2096
Change-Id: I74d032530faeddfab5a80f69ee8d81f49f4d6eb9
Mathieu Chartier [Sat, 24 Sep 2016 00:44:09 +0000 (00:44 +0000)]
Merge "Smarter image layout"
am:
48ec36f8a0
Change-Id: I1c5001b9f1d891f67fa36fced91b049936ab64d7
Treehugger Robot [Sat, 24 Sep 2016 00:37:51 +0000 (00:37 +0000)]
Merge "Smarter image layout"
Dimitry Ivanov [Fri, 23 Sep 2016 23:52:05 +0000 (16:52 -0700)]
Use liblog for liblog (instead of libcutils)
Because one wouldn't use libcutils if there is a liblog.
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and make
Change-Id: I5e7eb3a67a483835933e1b5587d43b697e39ceac
Mathieu Chartier [Tue, 20 Sep 2016 22:33:31 +0000 (15:33 -0700)]
Smarter image layout
Put strings in the dex file that resolves them.
Depth first traversal with overrides for class and dex cache. The
work list keeps track of what oat_index with each pushed item. This
means the static fields of a class will usually be in the same image.
Added layout test to image_test to make sure things are somewhat
reasonably attributed.
Bug:
28640955
Test: test-art-host
(cherry picked from commit
4e9c4e746617bad6a012d799d2f5cf9e01d24ea2)
Change-Id: I67a536c33aeed603b252d8e0f75622c9efbf2559
David Sehr [Thu, 22 Sep 2016 21:05:37 +0000 (14:05 -0700)]
Fix CTS crash from DexFile refactoring
Avoid path to nullptr access introduced by the previous refactoring.
Bug:
22322814
Change-Id: Id8874b26c072a11b0494e8126f8b0602a7c5b9e8
Test: m test-art-host, cts-tradefed run cts --skip-preconditions --skip-device-info --module vm-tests-tf
Robert Sesek [Fri, 23 Sep 2016 17:11:27 +0000 (17:11 +0000)]
Merge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache." am:
c16672a026
am:
cd9d8dc65c
Change-Id: Ic69db48c2d95990886bf933ef512b79016b7ed3d
Robert Sesek [Fri, 23 Sep 2016 17:09:56 +0000 (17:09 +0000)]
Merge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache."
am:
c16672a026
Change-Id: I1e7e21dcac13cfdc42d7efdeae44a14971099dc7
Treehugger Robot [Fri, 23 Sep 2016 17:05:40 +0000 (17:05 +0000)]
Merge "Add CanWriteToDalvikCache() check before writing a boot marker or image cache."
Aart Bik [Fri, 23 Sep 2016 15:24:50 +0000 (15:24 +0000)]
Merge "Minor jfuzz improvements." am:
304533ed84
am:
96be6c973b
Change-Id: I131602f9e0641d49a0f479ca5904b9cafccf7cd8
Aart Bik [Fri, 23 Sep 2016 15:22:21 +0000 (15:22 +0000)]
Merge "Minor jfuzz improvements."
am:
304533ed84
Change-Id: I951fc02aad45d18502139610345e8f16b9c2ebf7
Aart Bik [Fri, 23 Sep 2016 15:18:21 +0000 (15:18 +0000)]
Merge "Minor jfuzz improvements."
Sebastien Hertz [Fri, 23 Sep 2016 14:51:42 +0000 (16:51 +0200)]
Add DCE check to test 458-checker-instruct-simplification
Follow-up to
9837caff9cbfb61e3dabc6fbecb398d4d659c017 by checking
that dead code is actually removed.
Test: make -j32 test-art-host
Change-Id: Ic7848be893c6fe5e65f5bcdd525597072bf67857
Nicolas Geoffray [Fri, 23 Sep 2016 13:23:43 +0000 (13:23 +0000)]
Merge "Fix mips build after sharpening change." am:
ae3016324f
am:
f3a8f7d9a9
Change-Id: Ib217c40d71144b60de3bc2efbed046045fe04029
Nicolas Geoffray [Fri, 23 Sep 2016 13:21:44 +0000 (13:21 +0000)]
Merge "Fix mips build after sharpening change."
am:
ae3016324f
Change-Id: I70fcc86a9c2bbd1ecc8e4ac7cb0f5429305b88a7
Treehugger Robot [Fri, 23 Sep 2016 13:17:32 +0000 (13:17 +0000)]
Merge "Fix mips build after sharpening change."
Nicolas Geoffray [Fri, 23 Sep 2016 11:37:48 +0000 (12:37 +0100)]
Fix mips build after sharpening change.
test: m build-art-target
Change-Id: Ie1866a944be351878c7f860c640923bc0029f697
Nicolas Geoffray [Fri, 23 Sep 2016 09:56:02 +0000 (09:56 +0000)]
Merge "Clean-up sharpening and compiler driver." am:
cbb651fdf2
am:
a16472c789
Change-Id: Ie6b18bccece3755af69b3333a4993e0fcc1e59b0
Nicolas Geoffray [Fri, 23 Sep 2016 09:54:02 +0000 (09:54 +0000)]
Merge "Clean-up sharpening and compiler driver."
am:
cbb651fdf2
Change-Id: I5f0a556f72934a00dc24a0bdfb634d5baa0362e5
Treehugger Robot [Fri, 23 Sep 2016 09:49:47 +0000 (09:49 +0000)]
Merge "Clean-up sharpening and compiler driver."
Nicolas Geoffray [Fri, 23 Sep 2016 08:25:26 +0000 (08:25 +0000)]
Merge "Use android_root instead of hard coded /system in test script." am:
411caada9b
am:
5326e330ac
Change-Id: Iddcf444f1af5f4610b8203a78bccef4a2ff69f50
Nicolas Geoffray [Fri, 23 Sep 2016 08:23:26 +0000 (08:23 +0000)]
Merge "Use android_root instead of hard coded /system in test script."
am:
411caada9b
Change-Id: I75157ade60a8f1088707a15b275cf3be8ab13025
Nicolas Geoffray [Fri, 23 Sep 2016 08:19:08 +0000 (08:19 +0000)]
Merge "Use android_root instead of hard coded /system in test script."
Nicolas Geoffray [Thu, 22 Sep 2016 12:17:41 +0000 (13:17 +0100)]
Clean-up sharpening and compiler driver.
Remove dependency on compiler driver for sharpening
and dex2dex (the methods called on the compiler driver were
doing unnecessary work), and remove the now unused methods
in compiler driver.
Also remove test that is now invalid, as sharpening always
succeeds.
test: m test-art-host m test-art-target
Change-Id: I54e91c6839bd5b0b86182f2f43ba5d2c112ef908
Wojciech Staszkiewicz [Fri, 23 Sep 2016 06:42:20 +0000 (06:42 +0000)]
Merge "Prepare run_jfuzz_test.py to report bugs" am:
ca8bad9136
am:
0f58982f33
Change-Id: I882e7e558bc1a40a55a31ed26d4d9dc613750caa
Wojciech Staszkiewicz [Fri, 23 Sep 2016 06:40:50 +0000 (06:40 +0000)]
Merge "Prepare run_jfuzz_test.py to report bugs"
am:
ca8bad9136
Change-Id: Iaa785870e47a5a9498def3e2a5a5271442456cd6
Treehugger Robot [Fri, 23 Sep 2016 06:36:10 +0000 (06:36 +0000)]
Merge "Prepare run_jfuzz_test.py to report bugs"
Alex Light [Fri, 23 Sep 2016 00:51:14 +0000 (00:51 +0000)]
Merge "Disable test 902-hello-transformation on target" am:
35505bfe62
am:
e725a76e9e
Change-Id: Ib71cc9ed51479633c8f18715cfd7fadbb079a463
Alex Light [Fri, 23 Sep 2016 00:48:44 +0000 (00:48 +0000)]
Merge "Disable test 902-hello-transformation on target"
am:
35505bfe62
Change-Id: Ib06711ac0e6d7dd4a8d1d961ffbea6efd7726e65
Treehugger Robot [Fri, 23 Sep 2016 00:43:24 +0000 (00:43 +0000)]
Merge "Disable test 902-hello-transformation on target"
Aart Bik [Thu, 22 Sep 2016 20:50:11 +0000 (13:50 -0700)]
Minor jfuzz improvements.
Rationale:
Added simple class hierarchy to jfuzz output (still rather
rudimentary, but at least covers all method invocation kinds).
Also cleaned up the array dimensions logic.
Finally, increased granularity of time-based seeding.
Test: ./tools/jfuzz/run_jfuzz_test.py
Change-Id: I6582a75e5be593ba56146e1cd56f801e85f051c5
Alex Light [Thu, 22 Sep 2016 21:54:33 +0000 (14:54 -0700)]
Disable test 902-hello-transformation on target
This test doesn't work on device at the moment due to restrictions on
the android linker.
Bug:
31681198
Test: mma -j40 test-art-target-run-test-902-hello-transformation
Change-Id: I0ce72aa938a5c274083bcb0c60be5370a2bb02c3
Nicolas Geoffray [Thu, 22 Sep 2016 21:55:58 +0000 (22:55 +0100)]
Use android_root instead of hard coded /system in test script.
The buildbot uses its own ANDROID_ROOT.
Spotted while debugging 902 test failures on target.
Change-Id: I9b2047ce510e93f205771f7384f644450b0325e6
Wojciech Staszkiewicz [Wed, 21 Sep 2016 22:12:54 +0000 (15:12 -0700)]
Prepare run_jfuzz_test.py to report bugs
Adds --report_script and --fuzz_arg switches.
Report script is called for every divergence with title of
divergence, a comment and potentially bisection search output file.
Fuzz args are passed to jfuzz. They can be used to reproduce
previously discovered divergence.
Also add a -v switch to jfuzz. If present jfuzz will print its
version and exit.
Test: ./tools/jfuzz/run_jfuzz_test.py --report_script
$HOME/report_issue.py --fuzz_arg='-s
1470736838'
Change-Id: I25fd305304edfe21071a81d6e1b1b47ae8703007
Sen Jiang [Thu, 22 Sep 2016 19:28:32 +0000 (19:28 +0000)]
Merge "Pass --root to cpplint." am:
79bd5992ae
am:
2882087356
Change-Id: If372fdc9a813af1e21b9f6b7459d2610484cb10b
Sen Jiang [Thu, 22 Sep 2016 17:54:51 +0000 (17:54 +0000)]
Merge "Pass --root to cpplint."
am:
79bd5992ae
Change-Id: I8b10e75da388670fbb45f37e02543590e16bc5c1
Sen Jiang [Thu, 22 Sep 2016 17:49:44 +0000 (17:49 +0000)]
Merge "Pass --root to cpplint."
Roland Levillain [Thu, 22 Sep 2016 12:07:04 +0000 (12:07 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""" am:
9e5f321be4
am:
e77248f867
Change-Id: I2cd8ca51fe2e0e55d19d5db845bef3e6de022f03
Roland Levillain [Thu, 22 Sep 2016 12:03:32 +0000 (12:03 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests."""
am:
9e5f321be4
Change-Id: If37b172c62b3bb1671dacb9ce72325101f9203b0
Roland Levillain [Thu, 22 Sep 2016 11:55:19 +0000 (11:55 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests."""
Benoit Lamarche [Thu, 22 Sep 2016 11:45:52 +0000 (11:45 +0000)]
Merge "Ensure Jack generates annotations for test 005-annotations" am:
7e242e2972
am:
d0c95ba5a8
Change-Id: I7cd169ab9bb70785b718a7a1dc970ada05706c73
Benoit Lamarche [Thu, 22 Sep 2016 11:45:33 +0000 (11:45 +0000)]
Merge "Update art tests" am:
4670b99a26
am:
e1c27a7094
Change-Id: I7f7fa346121884ffbb18e64a4fcff00fb03ba95c
Dan Albert [Thu, 22 Sep 2016 11:43:40 +0000 (11:43 +0000)]
Merge "Don't warn for frame size in tests." am:
45026e4548
am:
0deea9af3a
Change-Id: I68005494ae886fe3f4fb0391bd07799f7faf5241
Aart Bik [Thu, 22 Sep 2016 11:43:27 +0000 (11:43 +0000)]
Merge "Renaming tool: jfuzz" am:
eb82e99525
am:
2617c7aa92
Change-Id: Ie9ed188bbd4455c30bd009b29039e1b50b390746
Mathieu Chartier [Thu, 22 Sep 2016 11:43:13 +0000 (11:43 +0000)]
Merge "Make image test multi image" am:
764f38f939
am:
935482f629
Change-Id: I3abee7d0cb759aedeb722663e0da7dddb1c53a92
Alex Light [Thu, 22 Sep 2016 11:42:59 +0000 (11:42 +0000)]
Merge "Get a basic modification of dex file working" am:
4b55b4b39a
am:
5ddce99415
Change-Id: I42e6da2474bb0ef2873ebd13b6a0e5889f8152a4
Scott Wakeling [Thu, 22 Sep 2016 09:24:38 +0000 (10:24 +0100)]
Revert "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""
This VIXL32-based code generator is not enabled in the optimizing
compiler by default. Changes in codegen_test.cc test it in parallel with
the existing ARM backend.
This patch provides a base for further work, the new backend will not
be enabled in the optimizing compiler until parity is proven with the
current ARM backend and assembler.
Test: gtest-codegen_test on host and target
This reverts commit
7863a2152865a12ad9593d8caad32698264153c1.
Change-Id: Ia09627bac22e78732ca982d207dc0b00bda435bb
Benoit Lamarche [Thu, 22 Sep 2016 09:41:12 +0000 (09:41 +0000)]
Merge "Ensure Jack generates annotations for test 005-annotations"
am:
7e242e2972
Change-Id: I8796f2a962efb1c2d610178f326a8a23de07a025
Benoit Lamarche [Thu, 22 Sep 2016 09:40:57 +0000 (09:40 +0000)]
Merge "Update art tests"
am:
4670b99a26
Change-Id: I73a4f08f0bee709b2168616d980fcfcd04a87375
Benoit Lamarche [Thu, 22 Sep 2016 09:34:26 +0000 (09:34 +0000)]
Merge "Ensure Jack generates annotations for test 005-annotations"
Benoit Lamarche [Thu, 22 Sep 2016 09:34:26 +0000 (09:34 +0000)]
Merge "Update art tests"
Dan Albert [Thu, 22 Sep 2016 08:18:31 +0000 (08:18 +0000)]
Merge "Don't warn for frame size in tests."
am:
45026e4548
Change-Id: I7fc12cda5a729607a7ad2a52208241d94d525d4e
Aart Bik [Thu, 22 Sep 2016 08:18:16 +0000 (08:18 +0000)]
Merge "Renaming tool: jfuzz"
am:
eb82e99525
Change-Id: I4d4603d0c2d47dac3232265342836d9dd3fed705
Mathieu Chartier [Thu, 22 Sep 2016 08:18:01 +0000 (08:18 +0000)]
Merge "Make image test multi image"
am:
764f38f939
Change-Id: Ib5e074340af35292d903c798fe8a00fc99a610f9
Alex Light [Thu, 22 Sep 2016 08:17:46 +0000 (08:17 +0000)]
Merge "Get a basic modification of dex file working"
am:
4b55b4b39a
Change-Id: I7c015be6efb9a7f824f91212ea3d3865f4e19ec3
Treehugger Robot [Thu, 22 Sep 2016 05:38:51 +0000 (05:38 +0000)]
Merge "Don't warn for frame size in tests."
Treehugger Robot [Thu, 22 Sep 2016 05:16:42 +0000 (05:16 +0000)]
Merge "Renaming tool: jfuzz"
Treehugger Robot [Thu, 22 Sep 2016 03:43:55 +0000 (03:43 +0000)]
Merge "Make image test multi image"
Mathieu Chartier [Wed, 21 Sep 2016 22:24:18 +0000 (15:24 -0700)]
Make image test multi image
Required for testing multi image layout in future CLs.
Bug:
28640955
Test: clean-oat-host, test-art-host, device booting
(cherry picked from commit
25adcfb7dc81131add3a0a681ae18bced6f7a0e0)
Change-Id: I14809f56e711b4a87e01056c327eddbbd087f4ee
Aart Bik [Wed, 21 Sep 2016 22:45:18 +0000 (15:45 -0700)]
Renaming tool: jfuzz
Test: run_jfuzz_test.py
Change-Id: I0efa31c3f1c30344c796a9077488e7e467d2456e
Treehugger Robot [Thu, 22 Sep 2016 01:06:27 +0000 (01:06 +0000)]
Merge "Get a basic modification of dex file working"
Igor Murashkin [Thu, 22 Sep 2016 00:52:58 +0000 (00:52 +0000)]
Merge "jni: Implement generic JNI support for @CriticalNative/@FastNative" am:
524dfe8086
am:
302c62c541
Change-Id: I23a464f1b725327f0311966ed2072a418c91e4c2
Igor Murashkin [Thu, 22 Sep 2016 00:45:30 +0000 (00:45 +0000)]
Merge "jni: Implement generic JNI support for @CriticalNative/@FastNative"
am:
524dfe8086
Change-Id: Ibaaedfb421087af6fc2bca83335ed04d8e1a6f96