OSDN Git Service

android-x86/art.git
7 years agoMerge "Make ScopedAssertNoThreadSuspension no overhead for non-debug" am: 26ead4975e
Mathieu Chartier [Wed, 14 Sep 2016 17:03:17 +0000 (17:03 +0000)]
Merge "Make ScopedAssertNoThreadSuspension no overhead for non-debug" am: 26ead4975e
am: 120e0b7028

Change-Id: I5337e58fa10e8249a9f4b1b6b83bcd870fd42dbe

7 years agoMerge "Make ScopedAssertNoThreadSuspension no overhead for non-debug"
Mathieu Chartier [Wed, 14 Sep 2016 17:00:16 +0000 (17:00 +0000)]
Merge "Make ScopedAssertNoThreadSuspension no overhead for non-debug"
am: 26ead4975e

Change-Id: I9c109f784cf101efe627cf495c72e7a2604421ed

7 years agoMerge "Update art to use hooks instead of customizer" am: 79f6d70618
Colin Cross [Wed, 14 Sep 2016 16:57:19 +0000 (16:57 +0000)]
Merge "Update art to use hooks instead of customizer" am: 79f6d70618
am: 8f11a751aa

Change-Id: I84bde0fcbb4bdb79d6d13bf5329907dc36a92bf5

7 years agoMerge "Make ScopedAssertNoThreadSuspension no overhead for non-debug"
Mathieu Chartier [Wed, 14 Sep 2016 16:55:56 +0000 (16:55 +0000)]
Merge "Make ScopedAssertNoThreadSuspension no overhead for non-debug"

7 years agoMerge "Update art to use hooks instead of customizer"
Colin Cross [Wed, 14 Sep 2016 16:54:47 +0000 (16:54 +0000)]
Merge "Update art to use hooks instead of customizer"
am: 79f6d70618

Change-Id: Id90182aa3018757095b4634fb901dceeb331e23b

7 years agoMerge "Update art to use hooks instead of customizer"
Colin Cross [Wed, 14 Sep 2016 16:50:18 +0000 (16:50 +0000)]
Merge "Update art to use hooks instead of customizer"

7 years agoMerge "ARM/ARM64: Fix throwing entrypoints to call runtime handlers." am: 52a8da639e
Vladimir Marko [Wed, 14 Sep 2016 16:45:46 +0000 (16:45 +0000)]
Merge "ARM/ARM64: Fix throwing entrypoints to call runtime handlers." am: 52a8da639e
am: b2d89c2b39

Change-Id: Ic60dd2d4fba1fca9d8a3ef4dd3861dfd0a6183e0

7 years agoMerge "ARM/ARM64: Fix throwing entrypoints to call runtime handlers."
Vladimir Marko [Wed, 14 Sep 2016 16:43:16 +0000 (16:43 +0000)]
Merge "ARM/ARM64: Fix throwing entrypoints to call runtime handlers."
am: 52a8da639e

Change-Id: Icfd04eee73ee323215cc10d690c9bbba27973ed4

7 years agoMerge "ARM/ARM64: Fix throwing entrypoints to call runtime handlers."
Treehugger Robot [Wed, 14 Sep 2016 16:36:35 +0000 (16:36 +0000)]
Merge "ARM/ARM64: Fix throwing entrypoints to call runtime handlers."

7 years agoMerge "Separate annotations from dexfile reading." am: 088efb4cf1
Aart Bik [Wed, 14 Sep 2016 16:03:12 +0000 (16:03 +0000)]
Merge "Separate annotations from dexfile reading." am: 088efb4cf1
am: a1d688ad88

Change-Id: If0f4483ba545571c7ff607bd23809e9048002e6f

7 years agoMerge "Separate annotations from dexfile reading."
Aart Bik [Wed, 14 Sep 2016 16:00:41 +0000 (16:00 +0000)]
Merge "Separate annotations from dexfile reading."
am: 088efb4cf1

Change-Id: I7f1b5511ad0199a550f6dcd92f5ff695657252a3

7 years agoMerge "Separate annotations from dexfile reading."
Aart Bik [Wed, 14 Sep 2016 15:55:07 +0000 (15:55 +0000)]
Merge "Separate annotations from dexfile reading."

7 years agoMerge "MIPS32: Implement table-based packed switch" am: 8850c73572
Alexey Frunze [Wed, 14 Sep 2016 15:11:38 +0000 (15:11 +0000)]
Merge "MIPS32: Implement table-based packed switch" am: 8850c73572
am: 3f29ae0f40

Change-Id: I169e8ecc55594ac3ef59ce54e4a04157372abab9

7 years agoMerge "MIPS32: Implement table-based packed switch"
Alexey Frunze [Wed, 14 Sep 2016 15:08:39 +0000 (15:08 +0000)]
Merge "MIPS32: Implement table-based packed switch"
am: 8850c73572

Change-Id: I7583811454efd24862c8cab792855452afe98d82

7 years agoSeparate annotations from dexfile reading.
David Sehr [Tue, 13 Sep 2016 15:58:35 +0000 (08:58 -0700)]
Separate annotations from dexfile reading.

Bug: 22322814
Change-Id: I867d66da407dd80394a10d19903ebbc1ec3986ff
Test: test-art

7 years agoMerge "MIPS32: Implement table-based packed switch"
Treehugger Robot [Wed, 14 Sep 2016 15:01:23 +0000 (15:01 +0000)]
Merge "MIPS32: Implement table-based packed switch"

7 years agoARM/ARM64: Fix throwing entrypoints to call runtime handlers.
Vladimir Marko [Wed, 14 Sep 2016 09:29:18 +0000 (10:29 +0100)]
ARM/ARM64: Fix throwing entrypoints to call runtime handlers.

Test: Run ART test suite including gcstress on Nexus 9.
Bug: 31468464
Change-Id: I2521675125d243be3168a2e87b70185791322b42

7 years agoMerge "Remove ThrowNoSuchMethod entrypoint." am: 58735fbfbb
Vladimir Marko [Wed, 14 Sep 2016 13:57:04 +0000 (13:57 +0000)]
Merge "Remove ThrowNoSuchMethod entrypoint." am: 58735fbfbb
am: 76580b6b63

Change-Id: Iecc5147c2e4af95a6bbce56c643a4a4ee5c9be64

7 years agoMerge "Remove ThrowNoSuchMethod entrypoint."
Vladimir Marko [Wed, 14 Sep 2016 13:48:03 +0000 (13:48 +0000)]
Merge "Remove ThrowNoSuchMethod entrypoint."
am: 58735fbfbb

Change-Id: I0a957e50944dbd690c359c4023673b455359c6ea

7 years agoMerge "Remove ThrowNoSuchMethod entrypoint."
Treehugger Robot [Wed, 14 Sep 2016 13:42:12 +0000 (13:42 +0000)]
Merge "Remove ThrowNoSuchMethod entrypoint."

7 years agoRemove ThrowNoSuchMethod entrypoint.
Vladimir Marko [Wed, 14 Sep 2016 11:49:57 +0000 (12:49 +0100)]
Remove ThrowNoSuchMethod entrypoint.

Run ART test suite on host and Nexus 6.
Bug: 31464666
Change-Id: I5aa737726031adae0b132f759cf802a93d581a7f

7 years agoMerge "Revert "Revert "Use implicit null checks inside try blocks.""" am: e305eaf2c0
Vladimir Marko [Wed, 14 Sep 2016 11:25:25 +0000 (11:25 +0000)]
Merge "Revert "Revert "Use implicit null checks inside try blocks.""" am: e305eaf2c0
am: 41d219635c

Change-Id: Ie78e8ae7048ddf4155ab5e9e478288f4f410808c

7 years agoMerge "Revert "Revert "Use implicit null checks inside try blocks."""
Vladimir Marko [Wed, 14 Sep 2016 11:22:25 +0000 (11:22 +0000)]
Merge "Revert "Revert "Use implicit null checks inside try blocks."""
am: e305eaf2c0

Change-Id: Ifd058e63aa920ec9769152c37198c0aabceb8c24

7 years agoMerge "Revert "Revert "Use implicit null checks inside try blocks."""
Treehugger Robot [Wed, 14 Sep 2016 11:16:24 +0000 (11:16 +0000)]
Merge "Revert "Revert "Use implicit null checks inside try blocks."""

7 years agoRevert "Revert "Use implicit null checks inside try blocks.""
Vladimir Marko [Tue, 13 Sep 2016 11:56:01 +0000 (11:56 +0000)]
Revert "Revert "Use implicit null checks inside try blocks.""

Fix implicit checks in try blocks to emit stack maps.
Fix arm64 null expection from signal entrypoint to call
the runtime handler instead or simply jumping there.

On Nexus 9, AOSP ToT, the boot.oat size reduction is
  prebuilt multi-part boot image:
    - 32-bit boot.oat: -448KiB (-1.3%)
    - 64-bit boot.oat: -528KiB (-1.2%)
  on-device built single boot image:
    - 32-bit boot.oat: -448KiB (-1.4%)
    - 64-bit boot.oat: -528KiB (-1.3%)
Note that the oat files no longer contain dex files which
have been moved to vdex, so the percentages are not directly
comparable with the those reported in the original commit.

Test: Run ART test suite including gc-stress on host and Nexus 9.
Bug: 30212852
Bug: 31468464

This reverts commit 0719b5b9b458cb3eb9f0823f0dacdfe1a71214dd.

Change-Id: If8a9da8c11adf2aad203e93b6684ce16ed776285

7 years agoMerge "Make dex2oat art_cc_binary instead of just cc_binary." am: 5cfaafbda5
Nicolas Geoffray [Wed, 14 Sep 2016 09:41:19 +0000 (09:41 +0000)]
Merge "Make dex2oat art_cc_binary instead of just cc_binary." am: 5cfaafbda5
am: 3e8a563675

Change-Id: Idecacc9076a9da153eee3171c72bc6d305adf29c

7 years agoMerge "Make dex2oat art_cc_binary instead of just cc_binary."
Nicolas Geoffray [Wed, 14 Sep 2016 09:38:19 +0000 (09:38 +0000)]
Merge "Make dex2oat art_cc_binary instead of just cc_binary."
am: 5cfaafbda5

Change-Id: Ib418ba66d3fabea5b852ced1f19ead54199996f9

7 years agoMerge "Make dex2oat art_cc_binary instead of just cc_binary."
Nicolas Geoffray [Wed, 14 Sep 2016 09:30:53 +0000 (09:30 +0000)]
Merge "Make dex2oat art_cc_binary instead of just cc_binary."

7 years agoMake dex2oat art_cc_binary instead of just cc_binary.
Nicolas Geoffray [Wed, 14 Sep 2016 09:26:56 +0000 (10:26 +0100)]
Make dex2oat art_cc_binary instead of just cc_binary.

This to get customized properties like CUSTOM_TARGET_LINKER.

Change-Id: Ifa25c52faa40fa6da40b614f664ab24ac1b7356a

7 years agoMIPS32: Implement table-based packed switch
Alexey Frunze [Sat, 10 Sep 2016 09:32:44 +0000 (02:32 -0700)]
MIPS32: Implement table-based packed switch

Test: booted MIPS32R2 in QEMU
Test: test-art-target-run-test-optimizing (MIPS32R2) on CI20
Test: booted MIPS64 (with 2nd arch MIPS32R6) in QEMU
Test: test-art-target-run-test-optimizing (MIPS32R6) in QEMU
Test: test-art-host-gtest

Change-Id: I2e1a65ff1ba9406b84351ba7998f853b1ce4aef9

7 years agoMerge "Fix mac build" am: b180b893b5
Colin Cross [Wed, 14 Sep 2016 02:05:51 +0000 (02:05 +0000)]
Merge "Fix mac build" am: b180b893b5
am: 349e70886d

Change-Id: If11a6565ddcf99ed5ae8a6bc5721ab6105b8962f

7 years agoMerge "Add test dependency on dexlist" am: 13d4a222f0
Colin Cross [Wed, 14 Sep 2016 02:05:50 +0000 (02:05 +0000)]
Merge "Add test dependency on dexlist" am: 13d4a222f0
am: 784105259d

Change-Id: I2460f23829aefa615b1d3d0734817ea14b6145fd

7 years agoMerge "Fix mac build"
Colin Cross [Wed, 14 Sep 2016 02:02:51 +0000 (02:02 +0000)]
Merge "Fix mac build"
am: b180b893b5

Change-Id: I6f42ae22e2ceb31612decca689296a44154e5d8a

7 years agoMerge "Add test dependency on dexlist"
Colin Cross [Wed, 14 Sep 2016 02:02:50 +0000 (02:02 +0000)]
Merge "Add test dependency on dexlist"
am: 13d4a222f0

Change-Id: I617afe4850b564400f6261ea43f8b510d04a5e15

7 years agoMerge "Fix mac build"
Treehugger Robot [Wed, 14 Sep 2016 01:57:44 +0000 (01:57 +0000)]
Merge "Fix mac build"

7 years agoMerge "Add test dependency on dexlist"
Treehugger Robot [Wed, 14 Sep 2016 01:55:12 +0000 (01:55 +0000)]
Merge "Add test dependency on dexlist"

7 years agoAdd test dependency on dexlist
Colin Cross [Tue, 13 Sep 2016 23:47:02 +0000 (16:47 -0700)]
Add test dependency on dexlist

dexlist_test depends on dexlist, add a new list of non-debuggable
executables for tests to depend on.

Bug: 31469510
Change-Id: I3e8f5798be523753ed8eda6cbbabe3251436877f

7 years agoFix mac build
Colin Cross [Tue, 13 Sep 2016 23:55:55 +0000 (16:55 -0700)]
Fix mac build

-z muldefs doesn't exist on mac.  It is only necessary for dex2oats,
which doesn't build on mac, move it from the defaults to the dex2oats
targets.

Change-Id: I47f35d159fc0602f54412e12ef44798ca4afa4de

7 years agoMerge "Fix mac build" am: 979d85df3e
Colin Cross [Tue, 13 Sep 2016 22:54:07 +0000 (22:54 +0000)]
Merge "Fix mac build" am: 979d85df3e
am: dc292beaf8

Change-Id: I0475575ccb44a3a7fd5a929730a83fb7ded1f378

7 years agoMerge "Fix mac build"
Colin Cross [Tue, 13 Sep 2016 22:51:36 +0000 (22:51 +0000)]
Merge "Fix mac build"
am: 979d85df3e

Change-Id: I5a5de81d3cd2dfd48b2042dcf8c1e507110f25be

7 years agoMerge "Fix mac build"
Treehugger Robot [Tue, 13 Sep 2016 22:44:00 +0000 (22:44 +0000)]
Merge "Fix mac build"

7 years agoMerge "String Compression (interpreter only) bug fix" am: c72b7d3ca9
jessicahandojo [Tue, 13 Sep 2016 22:23:04 +0000 (22:23 +0000)]
Merge "String Compression (interpreter only) bug fix" am: c72b7d3ca9
am: 17035ce0a3

Change-Id: Ib454591e288c6cd0100255c543fcef081bc79326

7 years agoMerge "String Compression (interpreter only) bug fix"
jessicahandojo [Tue, 13 Sep 2016 22:20:35 +0000 (22:20 +0000)]
Merge "String Compression (interpreter only) bug fix"
am: c72b7d3ca9

Change-Id: Icb8be4c9ade47edaaec23de2afe1838b4e2f0691

7 years agoMake ScopedAssertNoThreadSuspension no overhead for non-debug
Mathieu Chartier [Tue, 13 Sep 2016 19:09:38 +0000 (12:09 -0700)]
Make ScopedAssertNoThreadSuspension no overhead for non-debug

Previously it required Thread::Current() which may not be free.
The plan is to add a lot more ScopedAssertNoThreadSuspension in
the codebase.

Also cleaned up callers.

Bug: 31458474
Change-Id: I5a1621a5435476504d22266cc01a9bf26aab7568

7 years agoMerge "String Compression (interpreter only) bug fix"
Treehugger Robot [Tue, 13 Sep 2016 22:14:24 +0000 (22:14 +0000)]
Merge "String Compression (interpreter only) bug fix"

7 years agoMerge "Revert "Re-apply "Cleanup run-test and Makefile around boot image and PIC...
Hiroshi Yamauchi [Tue, 13 Sep 2016 21:35:05 +0000 (21:35 +0000)]
Merge "Revert "Re-apply "Cleanup run-test and Makefile around boot image and PIC.""" am: 2048da5f03
am: 1591ff45b1

Change-Id: Ifa80b06d8f8856bfa0ec0a5ed25158aeec08bc48

7 years agoMerge "Revert "Re-apply "Cleanup run-test and Makefile around boot image and PIC."""
Hiroshi Yamauchi [Tue, 13 Sep 2016 21:31:31 +0000 (21:31 +0000)]
Merge "Revert "Re-apply "Cleanup run-test and Makefile around boot image and PIC."""
am: 2048da5f03

Change-Id: I7fa88001227b9904708a9eb55cc11694078a48cd

7 years agoMerge "Revert "Re-apply "Cleanup run-test and Makefile around boot image and PIC."""
Treehugger Robot [Tue, 13 Sep 2016 21:20:21 +0000 (21:20 +0000)]
Merge "Revert "Re-apply "Cleanup run-test and Makefile around boot image and PIC."""

7 years agoFix mac build
Colin Cross [Tue, 13 Sep 2016 21:07:00 +0000 (14:07 -0700)]
Fix mac build

Change-Id: Ic3e74f96645384c0cec3aa5156f4ead8912f3be2

7 years agoMerge "Convert more of art to Android.bp" am: 54ec35e429
Colin Cross [Tue, 13 Sep 2016 20:58:02 +0000 (20:58 +0000)]
Merge "Convert more of art to Android.bp" am: 54ec35e429
am: a829979f18

Change-Id: I113d4295a96fb886fbf1409ad26f3e79db65a8b3

7 years agoMerge "Convert more of art to Android.bp"
Colin Cross [Tue, 13 Sep 2016 20:55:04 +0000 (20:55 +0000)]
Merge "Convert more of art to Android.bp"
am: 54ec35e429

Change-Id: I07d90ec75feed76106686877342c2fdfd3c85e81

7 years agoUpdate art to use hooks instead of customizer
Colin Cross [Tue, 13 Sep 2016 20:41:03 +0000 (13:41 -0700)]
Update art to use hooks instead of customizer

Change-Id: I46de5ea6ffbc0e32a0b306b8fe82b66b986e33cd

7 years agoMerge "Convert more of art to Android.bp"
Colin Cross [Tue, 13 Sep 2016 20:40:05 +0000 (20:40 +0000)]
Merge "Convert more of art to Android.bp"

7 years agoMerge "Add more logging for checking in to-space for CC copy" am: f8f81ea81d
Mathieu Chartier [Tue, 13 Sep 2016 20:03:54 +0000 (20:03 +0000)]
Merge "Add more logging for checking in to-space for CC copy" am: f8f81ea81d
am: 8f3123220a

Change-Id: I353759c7d5b4536ae06935f4495c9765c5a5a05b

7 years agoMerge "Add more logging for checking in to-space for CC copy"
Mathieu Chartier [Tue, 13 Sep 2016 20:01:24 +0000 (20:01 +0000)]
Merge "Add more logging for checking in to-space for CC copy"
am: f8f81ea81d

Change-Id: I63b2c11d45581d974fdb3531e433e2318682ca79

7 years agoMerge "Add more logging for checking in to-space for CC copy"
Treehugger Robot [Tue, 13 Sep 2016 19:54:55 +0000 (19:54 +0000)]
Merge "Add more logging for checking in to-space for CC copy"

7 years agoRevert "Re-apply "Cleanup run-test and Makefile around boot image and PIC.""
Hiroshi Yamauchi [Tue, 13 Sep 2016 19:37:22 +0000 (19:37 +0000)]
Revert "Re-apply "Cleanup run-test and Makefile around boot image and PIC.""

This reverts commit 9b5515ebb4502119c44e898b05c69312a45c5f49.

Breaks some gtests.

Change-Id: Ic9c9061b05219f19d5c7713ce0239e60c9d6e287

7 years agoMerge "ART: Rearrange some JVMTI headers" am: 1261034d85
Andreas Gampe [Tue, 13 Sep 2016 18:11:18 +0000 (18:11 +0000)]
Merge "ART: Rearrange some JVMTI headers" am: 1261034d85
am: f097013b13

Change-Id: I24c85d16ce4412606d91fb0a36030bc9c2d74d93

7 years agoMerge "ART: Rearrange some JVMTI headers"
Andreas Gampe [Tue, 13 Sep 2016 18:08:45 +0000 (18:08 +0000)]
Merge "ART: Rearrange some JVMTI headers"
am: 1261034d85

Change-Id: I118a449b50b16f6d4bbe429a154ea68f1dee2f90

7 years agoAdd more logging for checking in to-space for CC copy
Mathieu Chartier [Tue, 13 Sep 2016 17:02:48 +0000 (10:02 -0700)]
Add more logging for checking in to-space for CC copy

Trying to debug occasionally failing CHECK.

Bug: 31423258

Test: test-art-host CC baker

Change-Id: I00963eb4f529811090e485184bb48a28287e77d3

7 years agoMerge "ART: Rearrange some JVMTI headers"
Treehugger Robot [Tue, 13 Sep 2016 17:59:55 +0000 (17:59 +0000)]
Merge "ART: Rearrange some JVMTI headers"

7 years agoART: Rearrange some JVMTI headers
Andreas Gampe [Tue, 13 Sep 2016 16:05:59 +0000 (09:05 -0700)]
ART: Rearrange some JVMTI headers

Move around pieces to prepare for multiple cc files.

Bug: 31455788
Test: m test-art-host
Change-Id: I4e2dfccbca3b51c72ad8b1f1857d8eebc1ec43a2

7 years agoMerge "Re-apply "Cleanup run-test and Makefile around boot image and PIC."" am: 1f439...
Nicolas Geoffray [Tue, 13 Sep 2016 15:44:34 +0000 (15:44 +0000)]
Merge "Re-apply "Cleanup run-test and Makefile around boot image and PIC."" am: 1f43979c43
am: 623ab93889

Change-Id: I663ba0248f05e7dc9c78cce20bec6d0d31287902

7 years agoMerge "ART: Remove LogSeverity NONE" am: dc0c7e1074
Andreas Gampe [Tue, 13 Sep 2016 15:41:35 +0000 (15:41 +0000)]
Merge "ART: Remove LogSeverity NONE" am: dc0c7e1074
am: 36cc23a9e6

Change-Id: Ib03527acfed822c8e23c5cadb5c658aae064f626

7 years agoMerge "Re-apply "Cleanup run-test and Makefile around boot image and PIC.""
Nicolas Geoffray [Tue, 13 Sep 2016 15:41:34 +0000 (15:41 +0000)]
Merge "Re-apply "Cleanup run-test and Makefile around boot image and PIC.""
am: 1f43979c43

Change-Id: If459ddb61d1450662d3d4c94cd2051eb6229b9a2

7 years agoMerge "ART: Remove LogSeverity NONE"
Andreas Gampe [Tue, 13 Sep 2016 15:39:06 +0000 (15:39 +0000)]
Merge "ART: Remove LogSeverity NONE"
am: dc0c7e1074

Change-Id: I04bb187a5d2de3adde7f6316fcf012a311b2ec71

7 years agoMerge "Re-apply "Cleanup run-test and Makefile around boot image and PIC.""
Treehugger Robot [Tue, 13 Sep 2016 15:36:26 +0000 (15:36 +0000)]
Merge "Re-apply "Cleanup run-test and Makefile around boot image and PIC.""

7 years agoMerge "ART: Remove LogSeverity NONE"
Treehugger Robot [Tue, 13 Sep 2016 15:30:49 +0000 (15:30 +0000)]
Merge "ART: Remove LogSeverity NONE"

7 years agoRe-apply "Cleanup run-test and Makefile around boot image and PIC."
Nicolas Geoffray [Mon, 12 Sep 2016 15:08:02 +0000 (16:08 +0100)]
Re-apply "Cleanup run-test and Makefile around boot image and PIC."

This reverts commit 1ba223b2e6dab206b02613bc8b523553477fc4a0.

Change-Id: I0048afcefc5b654b62ddaf3c0d45ab201e4d3027

7 years agoMerge "New workaround for chromium buildbot." am: 8fb627442e
Nicolas Geoffray [Tue, 13 Sep 2016 13:23:56 +0000 (13:23 +0000)]
Merge "New workaround for chromium buildbot." am: 8fb627442e
am: 8c33aec246

Change-Id: Iefa6adc2558becedff4839f6f4fd770c82a642e3

7 years agoMerge "New workaround for chromium buildbot."
Nicolas Geoffray [Tue, 13 Sep 2016 13:20:56 +0000 (13:20 +0000)]
Merge "New workaround for chromium buildbot."
am: 8fb627442e

Change-Id: I89cdc08219e26ff44439127390b209f24fdb68cb

7 years agoMerge "New workaround for chromium buildbot."
Nicolas Geoffray [Tue, 13 Sep 2016 13:13:45 +0000 (13:13 +0000)]
Merge "New workaround for chromium buildbot."

7 years agoNew workaround for chromium buildbot.
Nicolas Geoffray [Tue, 13 Sep 2016 13:08:31 +0000 (14:08 +0100)]
New workaround for chromium buildbot.

Turns out once repo is init, doing a repo init/sync with another
repo version has no effect.

So instead just do the Android specific instructions
that the chromium repo seems to not do.

Change-Id: I0c42c4c2d61af54760a505a63554434f65c381c1

7 years agoMerge "Workaround for repo incompatibilities on buildbot." am: b83882173d
Nicolas Geoffray [Tue, 13 Sep 2016 13:02:24 +0000 (13:02 +0000)]
Merge "Workaround for repo incompatibilities on buildbot." am: b83882173d
am: 66e8b5dde4

Change-Id: Ib02b8b9c4943e1be67671b06abfdde92cd0c3173

7 years agoMerge "Workaround for repo incompatibilities on buildbot."
Nicolas Geoffray [Tue, 13 Sep 2016 12:59:54 +0000 (12:59 +0000)]
Merge "Workaround for repo incompatibilities on buildbot."
am: b83882173d

Change-Id: I0e92845d785edb58a5557e42f9cab5c1f396cf45

7 years agoMerge "Workaround for repo incompatibilities on buildbot."
Nicolas Geoffray [Tue, 13 Sep 2016 12:53:18 +0000 (12:53 +0000)]
Merge "Workaround for repo incompatibilities on buildbot."

7 years agoWorkaround for repo incompatibilities on buildbot.
Nicolas Geoffray [Tue, 13 Sep 2016 12:36:32 +0000 (13:36 +0100)]
Workaround for repo incompatibilities on buildbot.

Change-Id: Icd195f423e2e495d19ba35ed1d097e0f7d0a18ba

7 years agoMerge "Allow for testing alternative code generators in codegen_test.cc" am: c11d1b4282
Roland Levillain [Tue, 13 Sep 2016 09:45:42 +0000 (09:45 +0000)]
Merge "Allow for testing alternative code generators in codegen_test.cc" am: c11d1b4282
am: 1651bff628

Change-Id: I616fcceb2fd93c15fce8b554f7b4626e781cfc48

7 years agoMerge "Allow for testing alternative code generators in codegen_test.cc"
Roland Levillain [Tue, 13 Sep 2016 09:43:11 +0000 (09:43 +0000)]
Merge "Allow for testing alternative code generators in codegen_test.cc"
am: c11d1b4282

Change-Id: I7d363492e931d2ff0bb1e91be86f5981eeecb3a6

7 years agoMerge "Allow for testing alternative code generators in codegen_test.cc"
Roland Levillain [Tue, 13 Sep 2016 09:36:27 +0000 (09:36 +0000)]
Merge "Allow for testing alternative code generators in codegen_test.cc"

7 years agoMerge "Track libcore Executable.getParameter() changes" am: c9568796e8
Neil Fuller [Tue, 13 Sep 2016 09:10:13 +0000 (09:10 +0000)]
Merge "Track libcore Executable.getParameter() changes" am: c9568796e8
am: 71c69819cb

Change-Id: I0aa48389d37307e19658f42ab6a0c660ec8ae9ad

7 years agoMerge "Track libcore Executable.getParameter() changes"
Neil Fuller [Tue, 13 Sep 2016 09:07:44 +0000 (09:07 +0000)]
Merge "Track libcore Executable.getParameter() changes"
am: c9568796e8

Change-Id: Ic2be178a236f81c148e954fa69cbe1f45d764f7f

7 years agoMerge "Track libcore Executable.getParameter() changes"
Neil Fuller [Tue, 13 Sep 2016 09:02:35 +0000 (09:02 +0000)]
Merge "Track libcore Executable.getParameter() changes"

7 years agoMerge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: 9ef68a3ad0
Dan Willemsen [Tue, 13 Sep 2016 03:56:01 +0000 (03:56 +0000)]
Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: 9ef68a3ad0
am: 7978b56f1c

Change-Id: I8adf8450ba7bcc959af2bbb27d44e16d1358ac99

7 years agoMerge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n"
Dan Willemsen [Tue, 13 Sep 2016 03:51:07 +0000 (03:51 +0000)]
Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n"
am: 9ef68a3ad0

Change-Id: I69652863f469496194ee2f37b6a2a006f7202251

7 years agoMerge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n"
Dan Willemsen [Tue, 13 Sep 2016 03:47:01 +0000 (03:47 +0000)]
Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n"

7 years agoMerge "Add a debug check for unsaved callee-save register for diagnosis." am: 5e49b50589
Hiroshi Yamauchi [Tue, 13 Sep 2016 03:27:19 +0000 (03:27 +0000)]
Merge "Add a debug check for unsaved callee-save register for diagnosis." am: 5e49b50589
am: d9833707b4

Change-Id: I3d860f6b49cbc5caae848eea6823882f2ee66aa7

7 years agoART: Remove LogSeverity NONE
Andreas Gampe [Tue, 13 Sep 2016 03:22:19 +0000 (20:22 -0700)]
ART: Remove LogSeverity NONE

Remove non-standard severity, and instead use a new enum to
configure verifier logging.

Partially reverts commit 7fe30233d32a872f5349e921dba65bd767ad994b.

Bug: 31338270
Test: m test-art-host
Change-Id: If52ee23c4902fbf2dabe7b232f6742448764ff8c

7 years agoMerge "Add a debug check for unsaved callee-save register for diagnosis."
Hiroshi Yamauchi [Tue, 13 Sep 2016 03:24:48 +0000 (03:24 +0000)]
Merge "Add a debug check for unsaved callee-save register for diagnosis."
am: 5e49b50589

Change-Id: I7c9ec6db3c7e9d79cb1f9d991f1ee34729dfa4dc

7 years agoMerge "Add a debug check for unsaved callee-save register for diagnosis."
Treehugger Robot [Tue, 13 Sep 2016 03:17:46 +0000 (03:17 +0000)]
Merge "Add a debug check for unsaved callee-save register for diagnosis."

7 years agoMerge "ART: Remove libart from disassembler" am: 559532d1f2
Andreas Gampe [Tue, 13 Sep 2016 02:37:45 +0000 (02:37 +0000)]
Merge "ART: Remove libart from disassembler" am: 559532d1f2
am: 48f0c0a167

Change-Id: I13b5c39b41268e6287645fb6d196df4418a44664

7 years agoMerge "ART: Remove libart from disassembler"
Andreas Gampe [Tue, 13 Sep 2016 02:35:15 +0000 (02:35 +0000)]
Merge "ART: Remove libart from disassembler"
am: 559532d1f2

Change-Id: Ic33c945dd30687edfc58211d2f75c8b3011eb331

7 years agoMerge "ART: Remove libart from disassembler"
Treehugger Robot [Tue, 13 Sep 2016 02:26:49 +0000 (02:26 +0000)]
Merge "ART: Remove libart from disassembler"

7 years agoMerge "ART: Remove unnecessary file from vdex" am: 6a8c69f9d9
Andreas Gampe [Mon, 12 Sep 2016 23:55:34 +0000 (23:55 +0000)]
Merge "ART: Remove unnecessary file from vdex" am: 6a8c69f9d9
am: c659611a59

Change-Id: I29343ba39d627671c59441b73f3e45fab911e6cb

7 years agoMerge "ART: Remove unnecessary file from vdex"
Andreas Gampe [Mon, 12 Sep 2016 23:52:36 +0000 (23:52 +0000)]
Merge "ART: Remove unnecessary file from vdex"
am: 6a8c69f9d9

Change-Id: Ia8eb21c750047f939776f2c15e1e36f1f60e69dc

7 years agoMerge "ART: Remove unnecessary file from vdex"
Andreas Gampe [Mon, 12 Sep 2016 23:45:53 +0000 (23:45 +0000)]
Merge "ART: Remove unnecessary file from vdex"

7 years agoART: Remove libart from disassembler
Andreas Gampe [Mon, 12 Sep 2016 23:22:43 +0000 (16:22 -0700)]
ART: Remove libart from disassembler

The disassembler now only requires the headers. Also remove liblog
dependency.

Bug: 15436106
Test: m test-art-host
Test: m test-art-host-gtest-oatdump_test
Test: m test-art-target-gtest-oatdump_test
Change-Id: Iecff5b7f8ffd81c89ea81a4de8bfab77b5c103a7

7 years agoMerge "ART: Add generic system-weak holder infrastructure" am: f9decf915f
Andreas Gampe [Mon, 12 Sep 2016 23:29:33 +0000 (23:29 +0000)]
Merge "ART: Add generic system-weak holder infrastructure" am: f9decf915f
am: 3f94bdc565

Change-Id: I326091ee0ccd164b4c1a9a3453a54cb6b9da46d0

7 years agoConvert more of art to Android.bp
Colin Cross [Thu, 8 Sep 2016 19:52:18 +0000 (12:52 -0700)]
Convert more of art to Android.bp

Convert dex2oat, imgdiag, patchoat, and profman to Android.bp.

Test: m -j test-art-host
Test: mmma -j art
Change-Id: If2acd47189e5a944732c2c00c2bf31265f887161

7 years agoMerge "ART: Add generic system-weak holder infrastructure"
Andreas Gampe [Mon, 12 Sep 2016 23:27:02 +0000 (23:27 +0000)]
Merge "ART: Add generic system-weak holder infrastructure"
am: f9decf915f

Change-Id: Id8c1870367eadcc5582fba8ca1e4c31fedbf6fed