OSDN Git Service
Dan Albert [Thu, 22 Sep 2016 22:13:32 +0000 (22:13 +0000)]
Merge "Don't warn for frame size in tests." am:
45026e4548 am:
0deea9af3a
am:
676511153b
Change-Id: I076c0cf9237408b54cb27bb9eb49460bf0dfd84e
Aart Bik [Thu, 22 Sep 2016 22:13:15 +0000 (22:13 +0000)]
Merge "Renaming tool: jfuzz" am:
eb82e99525 am:
2617c7aa92
am:
cd0dcbed7d
Change-Id: I995fa375e1dad3dfdcf2211c29a6e330f25f4ab2
Mathieu Chartier [Thu, 22 Sep 2016 22:13:00 +0000 (22:13 +0000)]
Merge "Make image test multi image" am:
764f38f939 am:
935482f629
am:
7f6fdbdee1
Change-Id: Ie92ad3b420b445a4c67e474c7d4a09098053f245
Alex Light [Thu, 22 Sep 2016 22:12:43 +0000 (22:12 +0000)]
Merge "Get a basic modification of dex file working" am:
4b55b4b39a am:
5ddce99415
am:
37a9c75f4d
Change-Id: I1d17b4b1a59706faa524fa46dae9e0b7272b0f71
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
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"
Mathieu Chartier [Thu, 22 Sep 2016 04:32:45 +0000 (04:32 +0000)]
Merge "Make image test multi image" into nyc-mr1-dev am:
41be588f4f
am:
fe1bccedec
Change-Id: I8a9a358fab10ecc3d75e88a0074b2a8214a686d4
Mathieu Chartier [Thu, 22 Sep 2016 04:32:19 +0000 (04:32 +0000)]
Make image test multi image am:
25adcfb7dc
am:
211afe9f47 -s ours
Change-Id: Ic80b6bf73da378d5b3cfd97235d8966e068e5df3
Treehugger Robot [Thu, 22 Sep 2016 03:43:55 +0000 (03:43 +0000)]
Merge "Make image test multi image"
Mathieu Chartier [Thu, 22 Sep 2016 02:48:10 +0000 (02:48 +0000)]
Merge "Make image test multi image" into nyc-mr1-dev
am:
41be588f4f
Change-Id: I427a63c24354ca8f6f8df788881730b95128e16b
Mathieu Chartier [Thu, 22 Sep 2016 02:48:09 +0000 (02:48 +0000)]
Make image test multi image
am:
25adcfb7dc
Change-Id: Iea181f7ef946b7a063d3424845774517011fc706
Igor Murashkin [Thu, 22 Sep 2016 02:19:54 +0000 (02:19 +0000)]
Merge "jni: Implement generic JNI support for @CriticalNative/@FastNative" am:
524dfe8086 am:
302c62c541
am:
5d53c8c536
Change-Id: I35e46fe76e3d060da473049e58d4a6b140a2aafc
TreeHugger Robot [Thu, 22 Sep 2016 02:00:45 +0000 (02:00 +0000)]
Merge "Make image test multi image" into nyc-mr1-dev
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
Colin Cross [Thu, 22 Sep 2016 00:49:41 +0000 (00:49 +0000)]
Merge "Reimplement ART_NDEBUG_OPT_FLAG" am:
16cb669007 am:
5b4a949421
am:
4e611a9ea7
Change-Id: Ic6c0037dbf33c4309a1beba720913dd011a5b78e
Aart Bik [Thu, 22 Sep 2016 00:49:27 +0000 (00:49 +0000)]
Merge "Implemented first version of java/dex fuzz testing script." am:
a51a135f11 am:
8fca5667c8
am:
e6241a56a9
Change-Id: I6b08ab8aa2d368c5ab6d2aee1fa39c9a9f6da8b3
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
Treehugger Robot [Thu, 22 Sep 2016 00:37:06 +0000 (00:37 +0000)]
Merge "jni: Implement generic JNI support for @CriticalNative/@FastNative"
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-hos, test-art-host, device booting
Change-Id: I14809f56e711b4a87e01056c327eddbbd087f4ee
Colin Cross [Wed, 21 Sep 2016 23:28:56 +0000 (23:28 +0000)]
Merge "Reimplement ART_NDEBUG_OPT_FLAG" am:
16cb669007
am:
5b4a949421
Change-Id: I6d1e47a79114b278769b1504b10d69682434bc0e
Aart Bik [Wed, 21 Sep 2016 23:28:40 +0000 (23:28 +0000)]
Merge "Implemented first version of java/dex fuzz testing script." am:
a51a135f11
am:
8fca5667c8
Change-Id: I6cdb429ff162d46882cd3f4849ba327a08188517
Colin Cross [Wed, 21 Sep 2016 23:11:03 +0000 (23:11 +0000)]
Merge "Reimplement ART_NDEBUG_OPT_FLAG"
am:
16cb669007
Change-Id: I267b386a43ce1bb76d837336b82e2a74865c007b
Treehugger Robot [Wed, 21 Sep 2016 22:55:25 +0000 (22:55 +0000)]
Merge "Reimplement ART_NDEBUG_OPT_FLAG"
Alex Light [Tue, 23 Aug 2016 22:05:12 +0000 (15:05 -0700)]
Get a basic modification of dex file working
This allows the modification of a single classes methods through
transformation. One must ensure that the provided dex file only
contains one function and does not add or remove any methods or fields
and does not change the inheritance hierarchy in any way. The provided
dex file must verify and there must be no frames of the old code
present on any thread. These constraints are not checked or verified.
Breaking them might cause undefined behavior in all parts of the
runtime. Code that has been inlined in any way might not be replaced.
This feature is extremely experimental.
Bug:
31455788
Test: ./test/run-test --host 902-hello-transformation
Change-Id: I35133d24f6cdafdd2af9dc9863e15ba8493fc50e
Aart Bik [Wed, 21 Sep 2016 22:01:20 +0000 (22:01 +0000)]
Merge "Implemented first version of java/dex fuzz testing script."
am:
a51a135f11
Change-Id: Ib279fe9a90a39f272de296a8a68e474c37942a9d
Dan Albert [Wed, 21 Sep 2016 21:56:51 +0000 (14:56 -0700)]
Don't warn for frame size in tests.
The libc++ update I'm working on trips this (seems to be related to
string constructors now being inlined, but I can't say for sure). ART
itself is still under the limits.
Test: mm
Bug: None
Change-Id: Ic23c3e3aadc8db625767d8ecc727aec84f1e4603
Treehugger Robot [Wed, 21 Sep 2016 21:55:59 +0000 (21:55 +0000)]
Merge "Implemented first version of java/dex fuzz testing script."
Igor Murashkin [Tue, 13 Sep 2016 22:57:37 +0000 (15:57 -0700)]
jni: Implement generic JNI support for @CriticalNative/@FastNative
Also:
* Extend existing test cases to check generic JNI for the above.
* Re-enable previously blacklisted @CriticalNative JNI run-tests.
Bug:
31400248
Change-Id: I436ed00c8b8880e936a0c3483bc0dc251f0c0ce2
Colin Cross [Wed, 21 Sep 2016 20:23:53 +0000 (13:23 -0700)]
Reimplement ART_NDEBUG_OPT_FLAG
Use ART_NDEBUG_OPT_FLAG or ART_DEBUG_OPT_FLAG to override the default -O
compiler arguments.
Fixes:
31653144
Test: mmma -j art
Test: m -j dex2oat dex2oatd ART_NDEBUG_OPT_FLAG=-O1 ART_DEBUG_OPT_FLAG=-O0
Change-Id: I9d48d94f5e262148ddac5c70068144a645ac9566
Colin Cross [Wed, 21 Sep 2016 19:40:49 +0000 (19:40 +0000)]
Merge "Remove unused build code" am:
32e2826a02 am:
a93ea5bda5
am:
9b0e786278
Change-Id: I0d7204a51b41ca28434c1bb67dfb9706ad965d51
Colin Cross [Wed, 21 Sep 2016 19:38:18 +0000 (19:38 +0000)]
Merge "Remove unused build code" am:
32e2826a02
am:
a93ea5bda5
Change-Id: I90540940cc81ac40f9ca3005b9cc0c5092e0a272
Colin Cross [Wed, 21 Sep 2016 19:35:49 +0000 (19:35 +0000)]
Merge "Remove unused build code"
am:
32e2826a02
Change-Id: I50ca63f7e274fbd840f16219e7a74e717f20b690
Colin Cross [Wed, 21 Sep 2016 19:32:01 +0000 (19:32 +0000)]
Merge "Remove unused build code"
Nicolas Geoffray [Wed, 21 Sep 2016 16:59:54 +0000 (16:59 +0000)]
Merge "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests."" am:
be0f728348 am:
e65d95f97c
am:
0db9ca0f64
Change-Id: Id4fad88a9c3c194a6fa2f9be849a614262678305
David Sehr [Wed, 21 Sep 2016 16:59:42 +0000 (16:59 +0000)]
Merge "Refactor Dex open methods" am:
ce092d0e37 am:
cb4be0a34b
am:
f206b530f3
Change-Id: I923fe8442725f3a8c998a898b6b1ccf85ad19698
David Brazdil [Wed, 21 Sep 2016 16:59:29 +0000 (16:59 +0000)]
Merge "Write VerifierDeps into VDEX." am:
85bf9def7f am:
928f9d41db
am:
c7cb9c5528
Change-Id: I2e2541c624ed203292afbe423901f126f0c733fc
David Brazdil [Wed, 21 Sep 2016 16:59:16 +0000 (16:59 +0000)]
Write VerifierDeps into VDEX. am:
5d5a36bddb am:
74dc42a40b
am:
dd4ac03ba5
Change-Id: Ic136cc2d45d51a13654955232cbef0db05b4e576
Nicolas Geoffray [Wed, 21 Sep 2016 16:57:28 +0000 (16:57 +0000)]
Merge "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests."" am:
be0f728348
am:
e65d95f97c
Change-Id: I06dd8e149caf5b26e94abaf0684dadf05bfda18c
David Sehr [Wed, 21 Sep 2016 16:57:13 +0000 (16:57 +0000)]
Merge "Refactor Dex open methods" am:
ce092d0e37
am:
cb4be0a34b
Change-Id: I26d84d37e15846f64b3db80aceac1c6ad918251b
David Brazdil [Wed, 21 Sep 2016 16:56:59 +0000 (16:56 +0000)]
Merge "Write VerifierDeps into VDEX." am:
85bf9def7f
am:
928f9d41db
Change-Id: I9683fa12b68130aab58515189353739055b58832
David Brazdil [Wed, 21 Sep 2016 16:56:45 +0000 (16:56 +0000)]
Write VerifierDeps into VDEX. am:
5d5a36bddb
am:
74dc42a40b
Change-Id: I22def8609fbba0dbe83c8986f606709e46d5565a
Nicolas Geoffray [Wed, 21 Sep 2016 16:54:51 +0000 (16:54 +0000)]
Merge "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""
am:
be0f728348
Change-Id: I1985b4b78d949d2b6066fd4712b597a899b424a7
David Sehr [Wed, 21 Sep 2016 16:54:37 +0000 (16:54 +0000)]
Merge "Refactor Dex open methods"
am:
ce092d0e37
Change-Id: I21202751731387d3eb3c41d26fc182b46557f8ce
David Brazdil [Wed, 21 Sep 2016 16:54:16 +0000 (16:54 +0000)]
Merge "Write VerifierDeps into VDEX."
am:
85bf9def7f
Change-Id: I3c42cabe73265c6cae5a59a7f81e9f42afafb1bd
David Brazdil [Wed, 21 Sep 2016 16:54:15 +0000 (16:54 +0000)]
Write VerifierDeps into VDEX.
am:
5d5a36bddb
Change-Id: Ia7052d356c2a80689f23fce38ef08fac9cb85db0
Nicolas Geoffray [Wed, 21 Sep 2016 16:53:31 +0000 (16:53 +0000)]
Merge "Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests.""
Treehugger Robot [Wed, 21 Sep 2016 16:53:26 +0000 (16:53 +0000)]
Merge "Refactor Dex open methods"
Nicolas Geoffray [Wed, 21 Sep 2016 16:53:03 +0000 (16:53 +0000)]
Revert "ARM: VIXL32: Add an initial code generator that passes codegen_tests."
Failing with:
art/compiler/optimizing/code_generator_arm_vixl.cc:396:47: error: too few arguments to function call, expected 3, have 2
ValidateInvokeRuntime(instruction, slow_path);
This reverts commit
b138dfbd76f9d8b64fb9dbaf1a7c25e2549b2a8c.
Change-Id: Idccfe076f5905ea92ecbe3afbc7c8c64ecda94be
Treehugger Robot [Wed, 21 Sep 2016 16:51:57 +0000 (16:51 +0000)]
Merge "Write VerifierDeps into VDEX."
Roland Levillain [Wed, 21 Sep 2016 16:50:01 +0000 (16:50 +0000)]
Merge "ARM: VIXL32: Add an initial code generator that passes codegen_tests." am:
d26a0a64d0 am:
73451a07a1
am:
883bb6d341
Change-Id: I761b59f52439ac44b47d0948e62f556e386d8e22
Neil Fuller [Wed, 21 Sep 2016 16:44:34 +0000 (16:44 +0000)]
Merge "Collapse ART's AbstractMethod class into Executable" am:
7b0d9228e9 am:
3ffef716a5
am:
e9c2a57e5f
Change-Id: Ib3a56ab815c56f8744cfce3a75bf461d5b60ed9b
Neil Fuller [Wed, 21 Sep 2016 16:44:23 +0000 (16:44 +0000)]
Collapse ART's AbstractMethod class into Executable am:
0e8443995a am:
6e562dab98
am:
086df2f11c
Change-Id: Ic7273615ed8bb3987d48303e36b55d7877356515
Roland Levillain [Wed, 21 Sep 2016 16:38:12 +0000 (16:38 +0000)]
Merge "ARM: VIXL32: Add an initial code generator that passes codegen_tests." am:
d26a0a64d0
am:
73451a07a1
Change-Id: I05e28af10098a56c1846222f9dec0250c664c016
Roland Levillain [Wed, 21 Sep 2016 16:35:43 +0000 (16:35 +0000)]
Merge "ARM: VIXL32: Add an initial code generator that passes codegen_tests."
am:
d26a0a64d0
Change-Id: I75172c710cdebd8f5b7fa1c7c19407ad6b0946a8
Roland Levillain [Wed, 21 Sep 2016 16:32:59 +0000 (16:32 +0000)]
Merge "ARM: VIXL32: Add an initial code generator that passes codegen_tests."
Aart Bik [Tue, 20 Sep 2016 21:34:13 +0000 (14:34 -0700)]
Implemented first version of java/dex fuzz testing script.
Test: run_dex_fuzz_test.py
Change-Id: I94bd6c39d8219bcf3ba0150f5537a9690f2820b5
Neil Fuller [Wed, 21 Sep 2016 16:27:26 +0000 (16:27 +0000)]
Merge "Collapse ART's AbstractMethod class into Executable" am:
7b0d9228e9
am:
3ffef716a5
Change-Id: If6113fbdb56e8eddc640cea98c43d6362080b5bc
Neil Fuller [Wed, 21 Sep 2016 16:26:49 +0000 (16:26 +0000)]
Collapse ART's AbstractMethod class into Executable am:
0e8443995a
am:
6e562dab98
Change-Id: I1d6c0d988989f8aa0771bd5e4b7f8b349840de99
Neil Fuller [Wed, 21 Sep 2016 16:18:48 +0000 (16:18 +0000)]
Merge "Collapse ART's AbstractMethod class into Executable"
am:
7b0d9228e9
Change-Id: I8db4d6e25bb9a14fac0940b779852dd3bc4d4031
Neil Fuller [Wed, 21 Sep 2016 16:16:53 +0000 (16:16 +0000)]
Collapse ART's AbstractMethod class into Executable
am:
0e8443995a
Change-Id: I69bcb686be32b3266af2c0491bca0937788f502a
Neil Fuller [Wed, 21 Sep 2016 16:01:56 +0000 (16:01 +0000)]
Merge "Collapse ART's AbstractMethod class into Executable"
David Brazdil [Wed, 14 Sep 2016 14:34:10 +0000 (15:34 +0100)]
Write VerifierDeps into VDEX.
This patch serializes VerifierDeps data and writes them into VDEX.
It also extends the VDEX header with sizes of the DEX and verifier
dependencies sections.
Bug:
30937355
Change-Id: I5aa5fc5eb8678533117138e445b757fa771973fb
David Sehr [Mon, 19 Sep 2016 22:02:18 +0000 (15:02 -0700)]
Refactor Dex open methods
Consolidate dex opening around a simpler single interface in DexFile.
Making this change prior to moving all but the simplest interface out of
dex_file.{cc,h}.
Bug:
22322814
Change-Id: I4c55019912a19a1c90f9022c20f5b8b954fc7a47
Test: test-art-{host,target}
Roland Levillain [Wed, 21 Sep 2016 14:57:04 +0000 (14:57 +0000)]
Merge "Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration." am:
abc41cb0e4 am:
0ac52ceb16
am:
c82471e86c
Change-Id: Icc3caf0a6b7ff4d4fedf4bb2975bfa75ed96beed
Roland Levillain [Wed, 21 Sep 2016 14:54:46 +0000 (14:54 +0000)]
Merge "Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration." am:
abc41cb0e4
am:
0ac52ceb16
Change-Id: I971fd44f87669a53c2932c9072dca180397e2c40
Roland Levillain [Wed, 21 Sep 2016 14:52:02 +0000 (14:52 +0000)]
Merge "Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration."
am:
abc41cb0e4
Change-Id: I2adeb9f913f3bf744ec657ecd0ca4655519d6a20
Roland Levillain [Wed, 21 Sep 2016 14:47:03 +0000 (14:47 +0000)]
Merge "Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration."
Roland Levillain [Wed, 21 Sep 2016 12:48:26 +0000 (13:48 +0100)]
Re-enable jsr166.LinkedTransferQueueTest tests on the CC configuration.
Test: art/tools/run-libcore-tests.sh --mode=host --variant=X32 --debug
Bug:
25883050
Bug:
12687968
Change-Id: I2eb40d70882cb3a6a3b5534c92d37a4b31b89859
Neil Fuller [Thu, 8 Sep 2016 12:43:31 +0000 (13:43 +0100)]
Collapse ART's AbstractMethod class into Executable
After the OpenJDK 8 pull there is now a common base class
for Method and Constructor that can be used instead.
Methods that are abstract on Executable but on Android
were implemented in AbstractMethod are now consistently
renamed to "{method}Internal", declared final and
given package-protected access.
For consistency with all other private, natively
implemented methods, the method getDeclaredAnnotations()
has been renamed getDeclaredAnnotationsNative().
Bug:
28666126
Bug:
31052885
Test: make test-art-host and cts run of CtsLibcoreTestCases
Change-Id: Ibfe6af6a47fe0cfffd0859ffbe58980aeb84e053
David Sehr [Tue, 20 Sep 2016 23:22:49 +0000 (23:22 +0000)]
Merge "Fix the target art method address within a method object" am:
c4cb3d532d am:
6cefbb8e2c
am:
849759f379
Change-Id: I5d788e0e40d5ade00b91d38afff6dcdce14b0a29
David Sehr [Tue, 20 Sep 2016 23:20:18 +0000 (23:20 +0000)]
Merge "Fix the target art method address within a method object" am:
c4cb3d532d
am:
6cefbb8e2c
Change-Id: Ia7e0e7040811b97171d456279746e31d89ed404a
David Sehr [Tue, 20 Sep 2016 23:17:47 +0000 (23:17 +0000)]
Merge "Fix the target art method address within a method object"
am:
c4cb3d532d
Change-Id: I2940983654411585f66c8094b84f2933cac365e1
David Sehr [Tue, 20 Sep 2016 23:15:18 +0000 (23:15 +0000)]
Merge "Fix the target art method address within a method object"
Colin Cross [Tue, 20 Sep 2016 16:54:58 +0000 (09:54 -0700)]
Remove unused build code
All of the native code in art that used the custom build logic is built
with soong now, remove the make build code, leaving the definitions that
are still used by the test runner.
Test: m -j test-art-host
Test: m -j test-art-target
Change-Id: Iaba34a5c52be007bea153401375f4d0ae3ffce06
Wojciech Staszkiewicz [Tue, 20 Sep 2016 22:11:24 +0000 (22:11 +0000)]
Merge "Rework logcat handling" am:
f6dc081999 am:
1f5e995d4a
am:
92af6c3585
Change-Id: Ia7aa191c7bcfde4990ff02cbb303e38da8a15ce9
Wojciech Staszkiewicz [Tue, 20 Sep 2016 22:05:32 +0000 (22:05 +0000)]
Merge "Rework logcat handling" am:
f6dc081999
am:
1f5e995d4a
Change-Id: I5083048d465fbd3c758eab9674199181a438c174
Wojciech Staszkiewicz [Tue, 20 Sep 2016 22:03:01 +0000 (22:03 +0000)]
Merge "Rework logcat handling"
am:
f6dc081999
Change-Id: Ic3ecfcb9a142852c3fbe5ecabbb2843bc5492d36
Alex Light [Tue, 20 Sep 2016 22:03:01 +0000 (22:03 +0000)]
Merge "Rename several tests to be easier to read." am:
ce644e8446 am:
d2ca9454e0
am:
7c92f8cb59
Change-Id: I20393f5b1d3ed329c6d51ae64510368388aa99bb
Treehugger Robot [Tue, 20 Sep 2016 22:00:19 +0000 (22:00 +0000)]
Merge "Rework logcat handling"
Alex Light [Tue, 20 Sep 2016 21:57:59 +0000 (21:57 +0000)]
Merge "Rename several tests to be easier to read." am:
ce644e8446
am:
d2ca9454e0
Change-Id: Ic4939898438468996c6f797fdc1e1f029acfb838
Alex Light [Tue, 20 Sep 2016 21:55:29 +0000 (21:55 +0000)]
Merge "Rename several tests to be easier to read."
am:
ce644e8446
Change-Id: I54279c04857f228ae18895feebf68c8faaf83fee
Treehugger Robot [Tue, 20 Sep 2016 21:52:18 +0000 (21:52 +0000)]
Merge "Rename several tests to be easier to read."
Jeff Hao [Tue, 20 Sep 2016 21:13:46 +0000 (21:13 +0000)]
Merge "Dexlayout changes to support offset/size output of items." am:
d050ec91c0 am:
8de93c9b08
am:
29da825f00
Change-Id: Ife47b49182c45b47ebfe69e60101e8a728ab44cf
Jeff Hao [Tue, 20 Sep 2016 21:05:20 +0000 (21:05 +0000)]
Merge "Dexlayout changes to support offset/size output of items." am:
d050ec91c0
am:
8de93c9b08
Change-Id: I287fe695ad6115f1db1445972f00001699b8e448
Jeff Hao [Tue, 20 Sep 2016 21:02:49 +0000 (21:02 +0000)]
Merge "Dexlayout changes to support offset/size output of items."
am:
d050ec91c0
Change-Id: I4ee9dde68080152e8a8b95f46ce5e29dd3d9276e
Jeff Hao [Tue, 20 Sep 2016 20:56:09 +0000 (20:56 +0000)]
Merge "Dexlayout changes to support offset/size output of items."
Wojciech Staszkiewicz [Fri, 16 Sep 2016 20:44:09 +0000 (13:44 -0700)]
Rework logcat handling
Only extract logs from dex2oat instances that were started by the
correct runtime. This is accomplished by getting pid of runtime
and then filtering logcat output based on dex2oat 'parent PID ='
messages.
Test: bisection_search.py -cp classes.dex --class Test
--expected-output out --device
Change-Id: Ib1a5da6fac1560c57af8245e3a921d10bf464f2a
Jing Ji [Thu, 1 Sep 2016 02:21:37 +0000 (21:21 -0500)]
Fix the target art method address within a method object
The target offset of art method within a method object should
take account of the offset of the image which is declaring this
method.
Bug:
31311504
Change-Id: Id6670dd3436b4bf5fb943d8d6234851fb336a4dc
(cherry picked from commit
1717159b07abefcf59d099bc81158644f0a0bffb)
Test: test-art-{host,target}
Alex Light [Tue, 20 Sep 2016 19:50:37 +0000 (12:50 -0700)]
Rename several tests to be easier to read.
Several tests had their names changed recently for file name length
reasons. This change makes several of the tests have more consistent
and easy to read names.
Bug:
31597671
Test: mma test-art-host
Change-Id: I166f03b604c200256f997c18f7cb091548002777
OSDN Git Service
