OSDN Git Service
Calin Juravle [Sat, 4 Jul 2015 02:58:17 +0000 (02:58 +0000)]
am
ba973b01: am
b447598f: Merge "Disable static builds for mac and asan."
* commit '
ba973b0169f2a2495fecfa41e928d388ebfc19d4':
Disable static builds for mac and asan.
Nicolas Geoffray [Sat, 4 Jul 2015 02:58:16 +0000 (02:58 +0000)]
am
9fc5eea8: am
aefdcd9a: Merge "Do not create a HBoundType when the instruction is non-null."
* commit '
9fc5eea81689f548879ac1dc3a65baea840a6e6d':
Do not create a HBoundType when the instruction is non-null.
Calin Juravle [Sat, 4 Jul 2015 02:58:03 +0000 (02:58 +0000)]
am
9245286c: am
06b6da5c: Merge "Fix mac build: use -lrt only on linux."
* commit '
9245286cfef8d340553c91523a706eb557d5f24b':
Fix mac build: use -lrt only on linux.
Calin Juravle [Sat, 4 Jul 2015 02:57:47 +0000 (02:57 +0000)]
am
217cecaa: am
a3529ea5: Merge "Enable ART_BUILD_HOST_STATIC for check builds."
* commit '
217cecaa04e3fd4257d854055f4b18a96aa083c4':
Enable ART_BUILD_HOST_STATIC for check builds.
Calin Juravle [Sat, 4 Jul 2015 02:57:39 +0000 (02:57 +0000)]
am
acc4f7d7: am
23bfc0bd: Merge "Build statically linked version of dex2oat."
* commit '
acc4f7d728cfdce561e01d1fad37df6c30afd5ce':
Build statically linked version of dex2oat.
Calin Juravle [Sat, 4 Jul 2015 02:57:37 +0000 (02:57 +0000)]
am
1302d1a0: am
7a20ae64: Merge "Allow for sig chain to be disabled."
* commit '
1302d1a0b4f4d236445ea1fe0d7c883edcc12878':
Allow for sig chain to be disabled.
Roland Levillain [Sat, 4 Jul 2015 02:57:31 +0000 (02:57 +0000)]
am
47fb52c7: am
c87c8939: Merge "Implement heap poisoning in ART\'s Optimizing compiler."
* commit '
47fb52c796718089b87f5b42556e5b961986c0bd':
Implement heap poisoning in ART's Optimizing compiler.
Calin Juravle [Thu, 2 Jul 2015 17:33:01 +0000 (17:33 +0000)]
am
b447598f: Merge "Disable static builds for mac and asan."
* commit '
b447598f6900f05f0b1940a0731ee374c57c3100':
Disable static builds for mac and asan.
Calin Juravle [Thu, 2 Jul 2015 17:23:56 +0000 (17:23 +0000)]
Merge "Disable static builds for mac and asan."
Calin Juravle [Thu, 2 Jul 2015 17:21:14 +0000 (18:21 +0100)]
Disable static builds for mac and asan.
- asan doesn't support static linkage
- we don't need a static build of dex2oat for mac
Change-Id: I7eddd19f1f47e8b2a67ecc0aaf40cb70941febdd
Nicolas Geoffray [Thu, 2 Jul 2015 17:08:41 +0000 (17:08 +0000)]
am
aefdcd9a: Merge "Do not create a HBoundType when the instruction is non-null."
* commit '
aefdcd9a06bc436a0f0908230856d1054018cd93':
Do not create a HBoundType when the instruction is non-null.
Nicolas Geoffray [Thu, 2 Jul 2015 17:01:02 +0000 (17:01 +0000)]
Merge "Do not create a HBoundType when the instruction is non-null."
Nicolas Geoffray [Thu, 2 Jul 2015 16:43:06 +0000 (16:43 +0000)]
am
3b3b1243: am
3abd4375: Do not create a HBoundType when the instruction is non-null.
* commit '
3b3b124348de8779d843cdafe49b633dc60186ab':
Do not create a HBoundType when the instruction is non-null.
Nicolas Geoffray [Thu, 2 Jul 2015 14:48:27 +0000 (15:48 +0100)]
Do not create a HBoundType when the instruction is non-null.
We don't need to refine the type after a null check, if the
instruction is known non null or null. As a side effect, this
avoids replacing HLoadClass instructions with HBoundType instructions.
bug:
22116987
(cherry picked from commit
3abd437507f8ba30a238a52c273c9944dcb9d5a1)
Change-Id: I5e56de293554534195ade9770b7d1e4b078d685b
Nicolas Geoffray [Thu, 2 Jul 2015 16:31:12 +0000 (16:31 +0000)]
am
3abd4375: Do not create a HBoundType when the instruction is non-null.
* commit '
3abd437507f8ba30a238a52c273c9944dcb9d5a1':
Do not create a HBoundType when the instruction is non-null.
Nicolas Geoffray [Thu, 2 Jul 2015 14:48:27 +0000 (15:48 +0100)]
Do not create a HBoundType when the instruction is non-null.
We don't need to refine the type after a null check, if the
instruction is known non null or null. As a side effect, this
avoids replacing HLoadClass instructions with HBoundType instructions.
bug:
22116987
Change-Id: I565ae95db5a64faec30e026674636e398e0bf445
Calin Juravle [Thu, 2 Jul 2015 13:04:13 +0000 (13:04 +0000)]
am
06b6da5c: Merge "Fix mac build: use -lrt only on linux."
* commit '
06b6da5ccbf9246c697b8cf1be0ba58ce616521d':
Fix mac build: use -lrt only on linux.
Calin Juravle [Thu, 2 Jul 2015 12:52:48 +0000 (12:52 +0000)]
Merge "Fix mac build: use -lrt only on linux."
Calin Juravle [Thu, 2 Jul 2015 12:48:37 +0000 (13:48 +0100)]
Fix mac build: use -lrt only on linux.
Change-Id: I25e6058d9003fa52ef3c8bd153c2108712ce7f96
Calin Juravle [Thu, 2 Jul 2015 11:09:04 +0000 (11:09 +0000)]
am
a3529ea5: Merge "Enable ART_BUILD_HOST_STATIC for check builds."
* commit '
a3529ea5ec5c494647d72e219263d4ca374ca2ff':
Enable ART_BUILD_HOST_STATIC for check builds.
Calin Juravle [Thu, 2 Jul 2015 11:02:38 +0000 (11:02 +0000)]
Merge "Enable ART_BUILD_HOST_STATIC for check builds."
Calin Juravle [Thu, 2 Jul 2015 10:51:22 +0000 (11:51 +0100)]
Enable ART_BUILD_HOST_STATIC for check builds.
Change-Id: Id888c3b0c544ea6a85799f2264b13f1d035fc754
Calin Juravle [Thu, 2 Jul 2015 10:39:25 +0000 (10:39 +0000)]
am
23bfc0bd: Merge "Build statically linked version of dex2oat."
* commit '
23bfc0bd4b9af12c6b3a574719917f92e4b8c261':
Build statically linked version of dex2oat.
Calin Juravle [Thu, 2 Jul 2015 10:39:24 +0000 (10:39 +0000)]
am
7a20ae64: Merge "Allow for sig chain to be disabled."
* commit '
7a20ae64a6d994eec8cb04602325aed91713cb72':
Allow for sig chain to be disabled.
Calin Juravle [Thu, 2 Jul 2015 10:30:06 +0000 (10:30 +0000)]
Merge "Build statically linked version of dex2oat."
Calin Juravle [Thu, 2 Jul 2015 10:29:48 +0000 (10:29 +0000)]
Merge "Allow for sig chain to be disabled."
Roland Levillain [Thu, 2 Jul 2015 09:37:21 +0000 (09:37 +0000)]
am
c87c8939: Merge "Implement heap poisoning in ART\'s Optimizing compiler."
* commit '
c87c8939ea1bcfbddb954478d527cf1138f4f343':
Implement heap poisoning in ART's Optimizing compiler.
Roland Levillain [Thu, 2 Jul 2015 08:44:21 +0000 (08:44 +0000)]
Merge "Implement heap poisoning in ART's Optimizing compiler."
Trevor Bunker [Thu, 2 Jul 2015 00:47:19 +0000 (00:47 +0000)]
Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into mnc-dev-plus-aosp
Andreas Gampe [Thu, 2 Jul 2015 00:46:49 +0000 (00:46 +0000)]
am
8c50ca9d: am
4990f5c1: Merge "ART: Symbolize all oat files in /data folder." into mnc-dev
* commit '
8c50ca9d8c53042eb4118748e3ec2c80b9c74f98':
ART: Symbolize all oat files in /data folder.
Andreas Gampe [Thu, 2 Jul 2015 00:46:48 +0000 (00:46 +0000)]
am
09af7504: am
b46ff2c3: Merge "ART: Fix data loss when symbolizing oat files." into mnc-dev
* commit '
09af750459342eb74147fa3a97523932f6880acd':
ART: Fix data loss when symbolizing oat files.
Andreas Gampe [Thu, 2 Jul 2015 00:46:42 +0000 (00:46 +0000)]
am
283774ef: am
01b2129d: Merge "Added index type of dex byte instructions."
* commit '
283774ef2e35c4a5b32e290629e3d38a471e2ed2':
Added index type of dex byte instructions.
Andreas Gampe [Thu, 2 Jul 2015 00:28:24 +0000 (00:28 +0000)]
am
4990f5c1: Merge "ART: Symbolize all oat files in /data folder." into mnc-dev
* commit '
4990f5c14a04b9aad1be50d206b7c1f8989d8923':
ART: Symbolize all oat files in /data folder.
Andreas Gampe [Thu, 2 Jul 2015 00:28:23 +0000 (00:28 +0000)]
am
b46ff2c3: Merge "ART: Fix data loss when symbolizing oat files." into mnc-dev
* commit '
b46ff2c3c24c9b45457db80494056b7792ae0edb':
ART: Fix data loss when symbolizing oat files.
Andreas Gampe [Thu, 2 Jul 2015 00:27:40 +0000 (00:27 +0000)]
am
01b2129d: Merge "Added index type of dex byte instructions."
* commit '
01b2129de3e182b79aa820e71fc7fa1ef42f2d35':
Added index type of dex byte instructions.
Andreas Gampe [Wed, 1 Jul 2015 20:27:06 +0000 (20:27 +0000)]
Merge "Added index type of dex byte instructions."
Nicolas Geoffray [Wed, 1 Jul 2015 19:02:46 +0000 (19:02 +0000)]
am
9d607c0e: am
f801a6a6: Merge "Do not replace a live phi with a dead phi." into mnc-dev
* commit '
9d607c0e91ba1069ae811dda753ea7eac294bffa':
Do not replace a live phi with a dead phi.
Andreas Gampe [Wed, 1 Jul 2015 17:50:21 +0000 (17:50 +0000)]
Merge "ART: Symbolize all oat files in /data folder." into mnc-dev
Andreas Gampe [Wed, 1 Jul 2015 17:50:07 +0000 (17:50 +0000)]
Merge "ART: Fix data loss when symbolizing oat files." into mnc-dev
Zheng Xu [Tue, 21 Apr 2015 09:35:25 +0000 (17:35 +0800)]
ART: Symbolize all oat files in /data folder.
Now we store oat files not only in /data/dalvik-cache, but also in
other places. This patch tries to pull all oat files from device
/data folder.
Bug:
21760614
(cherry picked from commit
468bcf63207420f18c0c8a8621aa2d774393c155)
Change-Id: Icf81cf28c29da2e248e4fbd84f5920f46ddc4cd6
Zheng Xu [Fri, 19 Jun 2015 06:12:45 +0000 (14:12 +0800)]
ART: Fix data loss when symbolizing oat files.
Bug:
21760614
(cherry picked from commit
98088c424efd45ea3c172d4bc16e191f26a007cc)
Change-Id: I1b40b8ee313a4d187439d969d083d12fb3997cda
Nicolas Geoffray [Wed, 1 Jul 2015 17:20:30 +0000 (18:20 +0100)]
resolved conflicts for merge of
7f2ac9c7 to mnc-dev-plus-aosp
Change-Id: I93d600c9be2e00ca572b7563e7e4e79dc24772e3
Nicolas Geoffray [Wed, 1 Jul 2015 16:20:36 +0000 (16:20 +0000)]
am
f801a6a6: Merge "Do not replace a live phi with a dead phi." into mnc-dev
* commit '
f801a6a69bac4a767c3b11da78145cc11b9ef7ac':
Do not replace a live phi with a dead phi.
Nicolas Geoffray [Wed, 1 Jul 2015 16:20:26 +0000 (16:20 +0000)]
am
ed6193a7: Merge "Revert "Revert "Do not update the type of something we already know.""" into mnc-dev
* commit '
ed6193a75b90ec3026622b2cbc146452a85b8d47':
Revert "Revert "Do not update the type of something we already know.""
Nicolas Geoffray [Wed, 1 Jul 2015 15:39:26 +0000 (15:39 +0000)]
am
6712dd0e: am
ea725ec1: Merge "Don\'t print signatures to avoid spaces."
* commit '
6712dd0ec7ff86701db327e2f7afa5bd418b649c':
Don't print signatures to avoid spaces.
David Brazdil [Wed, 1 Jul 2015 15:39:25 +0000 (15:39 +0000)]
am
0eb1e63e: am
8941d5e0: Merge "Address additional comments on try-catch CL"
* commit '
0eb1e63ece707e8039e943a12368bf9a21d8ce1b':
Address additional comments on try-catch CL
Roland Levillain [Wed, 1 Jul 2015 14:41:14 +0000 (15:41 +0100)]
Implement heap poisoning in ART's Optimizing compiler.
- Instrument ARM, ARM64, x86 and x86-64 code generators.
- Note: To turn heap poisoning on in Optimizing, set the
environment variable `ART_HEAP_POISONING' to "true"
before compiling ART.
Bug:
12687968
Change-Id: Ib3120b38cf805a8a50207a314b9ccc90c8d93740
Nicolas Geoffray [Wed, 1 Jul 2015 15:27:18 +0000 (15:27 +0000)]
am
ea725ec1: Merge "Don\'t print signatures to avoid spaces."
* commit '
ea725ec1b5b9a594842dde02b247f4707ee0c93a':
Don't print signatures to avoid spaces.
David Brazdil [Wed, 1 Jul 2015 15:27:17 +0000 (15:27 +0000)]
am
8941d5e0: Merge "Address additional comments on try-catch CL"
* commit '
8941d5e0755e8cd3f1e35e3efcbe8eeaf3b616fa':
Address additional comments on try-catch CL
Nicolas Geoffray [Wed, 1 Jul 2015 15:20:35 +0000 (15:20 +0000)]
Merge "Don't print signatures to avoid spaces."
David Brazdil [Wed, 1 Jul 2015 15:16:14 +0000 (15:16 +0000)]
Merge "Address additional comments on try-catch CL"
Nicolas Geoffray [Wed, 1 Jul 2015 15:10:44 +0000 (16:10 +0100)]
Don't print signatures to avoid spaces.
Change-Id: I64340fbd08282acb0eb4142d17d37e69bba507cf
David Brazdil [Wed, 1 Jul 2015 14:28:26 +0000 (15:28 +0100)]
Address additional comments on try-catch CL
Extra documentation of try-catch building.
Change-Id: I5048c5fcb354c76fa4a60c3d8d21dd216bc9f6cd
David Brazdil [Wed, 1 Jul 2015 14:18:43 +0000 (14:18 +0000)]
am
24adb675: am
8922e0b5: Merge "ART: Changes to try-catch in GraphBuilder"
* commit '
24adb6751000b5d29362e4879cb6e7d20b6d99f2':
ART: Changes to try-catch in GraphBuilder
David Brazdil [Wed, 1 Jul 2015 14:02:52 +0000 (14:02 +0000)]
am
8922e0b5: Merge "ART: Changes to try-catch in GraphBuilder"
* commit '
8922e0b575742aaabbb4168b8703f7c1a4cb346c':
ART: Changes to try-catch in GraphBuilder
David Brazdil [Wed, 1 Jul 2015 13:54:32 +0000 (13:54 +0000)]
Merge "ART: Changes to try-catch in GraphBuilder"
David Brazdil [Tue, 30 Jun 2015 14:41:36 +0000 (15:41 +0100)]
ART: Changes to try-catch in GraphBuilder
This patch adds an additional case into the insertion algorithm for
HTryBoundary inside HGraphBuilder in order to better handle catch
blocks covered by a TryItem.
Building SSA form also required to stop combining HTryBoundaries for
neighbouring TryItems because it was not clear which exception
handlers belong to which try block.
Change-Id: Ic68bd6ef98fee784609fa593cb08dca1f00a15e0
Nicolas Geoffray [Wed, 1 Jul 2015 13:27:53 +0000 (13:27 +0000)]
am
53004816: am
312f1bfc: Merge "Do not do a type check when setting null to an array."
* commit '
53004816f0fccb1f7b337f1bb37053a8ac62bd67':
Do not do a type check when setting null to an array.
Nicolas Geoffray [Wed, 1 Jul 2015 13:15:09 +0000 (13:15 +0000)]
am
00c087ec: am
39dc3759: Merge "Emit method name at invokes in the graph visualizer."
* commit '
00c087ecd8546a3914027cc8c8223cb3659b73a8':
Emit method name at invokes in the graph visualizer.
Nicolas Geoffray [Wed, 1 Jul 2015 13:14:40 +0000 (13:14 +0000)]
am
312f1bfc: Merge "Do not do a type check when setting null to an array."
* commit '
312f1bfcfd8f655e635c941dda147377d8bff814':
Do not do a type check when setting null to an array.
Nicolas Geoffray [Wed, 1 Jul 2015 13:01:51 +0000 (13:01 +0000)]
am
39dc3759: Merge "Emit method name at invokes in the graph visualizer."
* commit '
39dc3759fa9a32da145e8823430d16a6a5acaba6':
Emit method name at invokes in the graph visualizer.
Nicolas Geoffray [Wed, 1 Jul 2015 13:00:46 +0000 (13:00 +0000)]
Merge "Do not do a type check when setting null to an array."
Nicolas Geoffray [Wed, 1 Jul 2015 11:56:46 +0000 (12:56 +0100)]
Do not do a type check when setting null to an array.
Change-Id: I7387d45aea697d4a3de273335647220a815a992b
Nicolas Geoffray [Wed, 1 Jul 2015 12:50:28 +0000 (12:50 +0000)]
Merge "Emit method name at invokes in the graph visualizer."
Calin Juravle [Mon, 8 Jun 2015 09:35:24 +0000 (10:35 +0100)]
Build statically linked version of dex2oat.
Change-Id: Icde39b770781095af7bd87ae6b907ad97a8a05da
Sebastien Hertz [Wed, 1 Jul 2015 12:36:05 +0000 (12:36 +0000)]
am
cbcafdca: am
8406b313: Merge "Properly delete temp files during run-test"
* commit '
cbcafdcacd2aca6aa4154d74e9efa54c5d121d23':
Properly delete temp files during run-test
Roland Levillain [Wed, 1 Jul 2015 12:23:06 +0000 (12:23 +0000)]
am
3f7e97de: am
436cbc5e: Merge "Fix a MOV instruction in Optimizing\'s x86-64 code generator."
* commit '
3f7e97de5fae9b2971dd5d50a0daa531c1587708':
Fix a MOV instruction in Optimizing's x86-64 code generator.
Sebastien Hertz [Wed, 1 Jul 2015 12:21:46 +0000 (12:21 +0000)]
am
8406b313: Merge "Properly delete temp files during run-test"
* commit '
8406b3131e186ce75644f589b3b53eca375cd611':
Properly delete temp files during run-test
Sebastien Hertz [Wed, 1 Jul 2015 12:14:44 +0000 (12:14 +0000)]
Merge "Properly delete temp files during run-test"
Roland Levillain [Wed, 1 Jul 2015 12:11:02 +0000 (12:11 +0000)]
am
436cbc5e: Merge "Fix a MOV instruction in Optimizing\'s x86-64 code generator."
* commit '
436cbc5e4c360962275713f3d2649ff7be88aaa4':
Fix a MOV instruction in Optimizing's x86-64 code generator.
Nicolas Geoffray [Wed, 1 Jul 2015 12:04:22 +0000 (12:04 +0000)]
am
39e4c1d8: am
c7657e93: Merge "Use CompareAndBranchIf(Non)Zero when applicable."
* commit '
39e4c1d83d2143ac7fe6a284945ef8695ad69061':
Use CompareAndBranchIf(Non)Zero when applicable.
Nicolas Geoffray [Wed, 1 Jul 2015 12:00:15 +0000 (13:00 +0100)]
Emit method name at invokes in the graph visualizer.
Change-Id: I832f823463569724fca9c38cd70d9dd552f15b3a
Roland Levillain [Wed, 1 Jul 2015 11:58:21 +0000 (11:58 +0000)]
Merge "Fix a MOV instruction in Optimizing's x86-64 code generator."
Nicolas Geoffray [Wed, 1 Jul 2015 11:56:44 +0000 (11:56 +0000)]
am
c7657e93: Merge "Use CompareAndBranchIf(Non)Zero when applicable."
* commit '
c7657e93b6b045eaff18190b8133361652bf8c1c':
Use CompareAndBranchIf(Non)Zero when applicable.
Roland Levillain [Wed, 1 Jul 2015 11:47:25 +0000 (12:47 +0100)]
Fix a MOV instruction in Optimizing's x86-64 code generator.
Use `movl' instead of `movw' to store a 32-bit immediate
(integer or reference) into a field.
Also fix art::Location::RegisterOrInt32LongConstant to
properly handle non-long constants.
Change-Id: I34c6ec8eaa1632822a31969f87c9c2d6c5b96326
Nicolas Geoffray [Wed, 1 Jul 2015 11:46:48 +0000 (11:46 +0000)]
Merge "Use CompareAndBranchIf(Non)Zero when applicable."
Nicolas Geoffray [Wed, 1 Jul 2015 11:22:56 +0000 (12:22 +0100)]
Use CompareAndBranchIf(Non)Zero when applicable.
Now that we relocate branches, we can try make more use of cbz/cbnz.
Change-Id: I93ca64107f34eb3c43f2e7102ea90453113dad7a
Nicolas Geoffray [Wed, 1 Jul 2015 11:36:37 +0000 (11:36 +0000)]
Merge "Do not replace a live phi with a dead phi." into mnc-dev
Calin Juravle [Fri, 19 Jun 2015 21:05:39 +0000 (22:05 +0100)]
Allow for sig chain to be disabled.
Tools like dex2oat or patchoat don't need the sig chain or the fault
manager. This also enables building a statically link version of
dex2oat.
Change-Id: I9897728cac48acade854bb027bfde860628ebf84
Nicolas Geoffray [Wed, 1 Jul 2015 08:54:33 +0000 (08:54 +0000)]
Merge "Revert "Revert "Do not update the type of something we already know.""" into mnc-dev
Andreas Gampe [Wed, 1 Jul 2015 05:42:04 +0000 (05:42 +0000)]
am
bd9f8176: am
2b252dc1: Merge "Quick: Fix a DCHECK to take type conflicts into account."
* commit '
bd9f81765ba3e30b1037ad27d7ea47f9dbd7a1fc':
Quick: Fix a DCHECK to take type conflicts into account.
Andreas Gampe [Wed, 1 Jul 2015 05:30:34 +0000 (05:30 +0000)]
am
2b252dc1: Merge "Quick: Fix a DCHECK to take type conflicts into account."
* commit '
2b252dc15995a708aead33aab6d307205d860a88':
Quick: Fix a DCHECK to take type conflicts into account.
Andreas Gampe [Wed, 1 Jul 2015 05:29:37 +0000 (05:29 +0000)]
am
73512b66: am
39602104: Merge "ART: Symbolize all oat files in /data folder."
* commit '
73512b66ccbcb6abbd20993e1bd6128bc530f90e':
ART: Symbolize all oat files in /data folder.
Andreas Gampe [Wed, 1 Jul 2015 05:18:32 +0000 (05:18 +0000)]
am
39602104: Merge "ART: Symbolize all oat files in /data folder."
* commit '
396021047892e5976051e9cb86ee38943a9102d3':
ART: Symbolize all oat files in /data folder.
Andreas Gampe [Wed, 1 Jul 2015 05:17:24 +0000 (05:17 +0000)]
Merge "Quick: Fix a DCHECK to take type conflicts into account."
Andreas Gampe [Wed, 1 Jul 2015 05:06:20 +0000 (05:06 +0000)]
Merge "ART: Symbolize all oat files in /data folder."
Zheng Xu [Tue, 21 Apr 2015 09:35:25 +0000 (17:35 +0800)]
ART: Symbolize all oat files in /data folder.
Now we store oat files not only in /data/dalvik-cache, but also in
other places. This patch tries to pull all oat files from device
/data folder.
Change-Id: Icf81cf28c29da2e248e4fbd84f5920f46ddc4cd6
Andreas Gampe [Tue, 30 Jun 2015 23:36:31 +0000 (23:36 +0000)]
am
1e759863: am
e54cd64e: ART: Remove bad FindSymbol call
* commit '
1e759863dd1a56923003fb65781ffcb363806fdb':
ART: Remove bad FindSymbol call
Andreas Gampe [Tue, 30 Jun 2015 23:21:27 +0000 (23:21 +0000)]
am
e54cd64e: ART: Remove bad FindSymbol call
* commit '
e54cd64e97e5626d685e858cd871db248dacf7ea':
ART: Remove bad FindSymbol call
Evgenii Stepanov [Tue, 30 Jun 2015 22:37:48 +0000 (22:37 +0000)]
am
3c25c82e: am
371496da: Merge "Explicitly link libz-host to libart."
* commit '
3c25c82ecc183bceb6e0224b1a3d54e662c0a1a3':
Explicitly link libz-host to libart.
Evgenii Stepanov [Tue, 30 Jun 2015 22:30:05 +0000 (22:30 +0000)]
am
371496da: Merge "Explicitly link libz-host to libart."
* commit '
371496daf03921c0c3ade8bc20b33b6454d8d495':
Explicitly link libz-host to libart.
Evgenii Stepanov [Tue, 30 Jun 2015 22:19:13 +0000 (22:19 +0000)]
Merge "Explicitly link libz-host to libart."
Andreas Gampe [Tue, 30 Jun 2015 21:48:59 +0000 (21:48 +0000)]
am
94ff71af: am
053df00e: Merge "ART: Remove bad FindSymbol call"
* commit '
94ff71af6b8d5b2d37a4b293c7b3a8abd27c3ded':
ART: Remove bad FindSymbol call
Andreas Gampe [Tue, 30 Jun 2015 21:30:00 +0000 (21:30 +0000)]
am
053df00e: Merge "ART: Remove bad FindSymbol call"
* commit '
053df00e1d27e658f016f4ff6d5a822861555e6a':
ART: Remove bad FindSymbol call
Andreas Gampe [Tue, 30 Jun 2015 21:10:50 +0000 (21:10 +0000)]
Merge "ART: Remove bad FindSymbol call"
Andreas Gampe [Tue, 30 Jun 2015 18:23:44 +0000 (11:23 -0700)]
ART: Remove bad FindSymbol call
The removed call is superfluous under normal operation and harmful
when running a native-bridged library.
Bug:
22194296
Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2367
(cherry picked from commit
8fec90b421732b3eb278555f57aaf48fda4fa4ba)
Change-Id: I3eb8f435a6a974a3e87a370b254ba8752f2a59b3
Andreas Gampe [Tue, 30 Jun 2015 18:23:44 +0000 (11:23 -0700)]
ART: Remove bad FindSymbol call
The removed call is superfluous under normal operation and harmful
when running a native-bridged library.
Bug:
22194296
Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2367
Change-Id: I3eb8f435a6a974a3e87a370b254ba8752f2a59b3
Andreas Gampe [Tue, 30 Jun 2015 18:03:42 +0000 (18:03 +0000)]
am
8f25d20d: am
edf9daf3: Merge "ART: Unlink target oat file before compiling"
* commit '
8f25d20dd06f7affe72cbecd80709f8b1b9a87a1':
ART: Unlink target oat file before compiling
Andreas Gampe [Tue, 30 Jun 2015 18:03:41 +0000 (18:03 +0000)]
am
4ff0fb8c: am
d3af3480: Merge "Change ART_TEST_GC_STRESS to use new gcstress mode"
* commit '
4ff0fb8c17f3d6a13b9523bfedfe3e93ccda373b':
Change ART_TEST_GC_STRESS to use new gcstress mode
Andreas Gampe [Tue, 30 Jun 2015 18:03:40 +0000 (18:03 +0000)]
am
ce4f3bd1: am
915e9e0e: Merge "ART: Fix test 036-finalizer"
* commit '
ce4f3bd15ab564fee09dae133b24445908c46743':
ART: Fix test 036-finalizer