OSDN Git Service

android-x86/art.git
7 years agoMerge "Remove TypeLookupTable from DexFile." am: 6a4abc633f am: e6178e2143
David Sehr [Sat, 17 Sep 2016 20:49:33 +0000 (20:49 +0000)]
Merge "Remove TypeLookupTable from DexFile." am: 6a4abc633f am: e6178e2143
am: cf37b402a6

Change-Id: I5ec0e1e4647731535bf40e5e72ebad9773ddb913

7 years agoMerge "Remove TypeLookupTable from DexFile." am: 6a4abc633f
David Sehr [Sat, 17 Sep 2016 20:46:35 +0000 (20:46 +0000)]
Merge "Remove TypeLookupTable from DexFile." am: 6a4abc633f
am: e6178e2143

Change-Id: I7bacb482941511036308fe7d10b5deda88e64bb6

7 years agoMerge "Remove TypeLookupTable from DexFile."
David Sehr [Sat, 17 Sep 2016 20:44:02 +0000 (20:44 +0000)]
Merge "Remove TypeLookupTable from DexFile."
am: 6a4abc633f

Change-Id: Id26c8ab42a7282582937939f9d700523c30975bd

7 years agoMerge "Remove TypeLookupTable from DexFile."
Treehugger Robot [Sat, 17 Sep 2016 20:29:44 +0000 (20:29 +0000)]
Merge "Remove TypeLookupTable from DexFile."

7 years agoMerge "Fix 2ND arch gtest testing." am: 8d0e6c5c18 am: c2900a01c4
Nicolas Geoffray [Sat, 17 Sep 2016 13:51:20 +0000 (13:51 +0000)]
Merge "Fix 2ND arch gtest testing." am: 8d0e6c5c18 am: c2900a01c4
am: cf0b6b81e8

Change-Id: Ib3902d63521c87d70b6fe9347ff9bc8c7d63421c

7 years agoMerge "Fix 2ND arch gtest testing." am: 8d0e6c5c18
Nicolas Geoffray [Sat, 17 Sep 2016 13:48:19 +0000 (13:48 +0000)]
Merge "Fix 2ND arch gtest testing." am: 8d0e6c5c18
am: c2900a01c4

Change-Id: I4ada5618ec797fc728cd8e5984a2587ce6ea7b6c

7 years agoMerge "Fix 2ND arch gtest testing."
Nicolas Geoffray [Sat, 17 Sep 2016 13:45:49 +0000 (13:45 +0000)]
Merge "Fix 2ND arch gtest testing."
am: 8d0e6c5c18

Change-Id: Id04e0c3149b6280e5cfd67b609276ac297020072

7 years agoMerge "Fix 2ND arch gtest testing."
Nicolas Geoffray [Sat, 17 Sep 2016 13:39:09 +0000 (13:39 +0000)]
Merge "Fix 2ND arch gtest testing."

7 years agoRemove TypeLookupTable from DexFile.
David Sehr [Fri, 16 Sep 2016 01:13:52 +0000 (18:13 -0700)]
Remove TypeLookupTable from DexFile.

One more step towards removing runtime dependencies from the DexFile
API.  This severs the ties to OatFile.  Work remains to move MemMap out
of DexFile.

Bug: 22322814
Change-Id: I29e7ad8fd292c7919ed2689dc754b958b88d6819
Test: test-art-host

7 years agoMerge "Add a comment to dex2oat's parent pid logging" am: 47c22ff721 am: 55eba31217
Aart Bik [Fri, 16 Sep 2016 21:40:25 +0000 (21:40 +0000)]
Merge "Add a comment to dex2oat's parent pid logging" am: 47c22ff721 am: 55eba31217
am: f9c444fb64

Change-Id: If453669b6855d0aa8cdf77b78e4364bfd90b8e2c

7 years agoMerge "Add a comment to dex2oat's parent pid logging" am: 47c22ff721
Aart Bik [Fri, 16 Sep 2016 21:37:54 +0000 (21:37 +0000)]
Merge "Add a comment to dex2oat's parent pid logging" am: 47c22ff721
am: 55eba31217

Change-Id: Ibb637fc7474fe11d647f2295453e0690c21b0818

7 years agoMerge "Add a comment to dex2oat's parent pid logging"
Aart Bik [Fri, 16 Sep 2016 21:35:54 +0000 (21:35 +0000)]
Merge "Add a comment to dex2oat's parent pid logging"
am: 47c22ff721

Change-Id: Id0ca435c27d91048f8071a5f6eee24b769d876c7

7 years agoMerge "Add a comment to dex2oat's parent pid logging"
Aart Bik [Fri, 16 Sep 2016 21:30:54 +0000 (21:30 +0000)]
Merge "Add a comment to dex2oat's parent pid logging"

7 years agoFix 2ND arch gtest testing.
Nicolas Geoffray [Fri, 16 Sep 2016 15:41:43 +0000 (16:41 +0100)]
Fix 2ND arch gtest testing.

Change-Id: I944feac324c49a95904f69d7b03b072e7150c134

7 years agoMerge "Fix a deadlock in the CC collector." am: be3a3ee02f am: 3d86d46f67
Hiroshi Yamauchi [Fri, 16 Sep 2016 18:10:29 +0000 (18:10 +0000)]
Merge "Fix a deadlock in the CC collector." am: be3a3ee02f am: 3d86d46f67
am: 8d4db31d6e

Change-Id: Icc3c99286a06e5223c6899f590e1e500f9d0c566

7 years agoMerge "Fix a deadlock in the CC collector." am: be3a3ee02f
Hiroshi Yamauchi [Fri, 16 Sep 2016 18:07:32 +0000 (18:07 +0000)]
Merge "Fix a deadlock in the CC collector." am: be3a3ee02f
am: 3d86d46f67

Change-Id: I341f374b84836cbac32d4f3c6a823c298f405216

7 years agoMerge "Fix a deadlock in the CC collector."
Hiroshi Yamauchi [Fri, 16 Sep 2016 18:04:58 +0000 (18:04 +0000)]
Merge "Fix a deadlock in the CC collector."
am: be3a3ee02f

Change-Id: If75da5e6e72d7ba7556c800d31c7bfa830a7a211

7 years agoMerge "Fix a deadlock in the CC collector."
Treehugger Robot [Fri, 16 Sep 2016 17:59:09 +0000 (17:59 +0000)]
Merge "Fix a deadlock in the CC collector."

7 years agoMerge "Move art::Runtime::InitZygote logic from art into frameworks/base." am: c6eced...
Robert Sesek [Fri, 16 Sep 2016 17:51:36 +0000 (17:51 +0000)]
Merge "Move art::Runtime::InitZygote logic from art into frameworks/base." am: c6eced06a8 am: b59f931493
am: 6a9dd0d5c7

Change-Id: I24bc0fcc13a428f05263eb8cb171e32b2f1b0047

7 years agoMove art::Runtime::InitZygote logic from art into frameworks/base. am: b2267032bd...
Robert Sesek [Fri, 16 Sep 2016 17:51:23 +0000 (17:51 +0000)]
Move art::Runtime::InitZygote logic from art into frameworks/base. am: b2267032bd am: 8a0e2fd890
am: e98c456c29

Change-Id: I64e27974072e70e341210d1e8508df9a2dd176d4

7 years agoMerge "Move art::Runtime::InitZygote logic from art into frameworks/base." am: c6eced06a8
Robert Sesek [Fri, 16 Sep 2016 17:38:58 +0000 (17:38 +0000)]
Merge "Move art::Runtime::InitZygote logic from art into frameworks/base." am: c6eced06a8
am: b59f931493

Change-Id: Ib70a52aac49596a2a6d00fa4ffb629b343dffe60

7 years agoMove art::Runtime::InitZygote logic from art into frameworks/base. am: b2267032bd
Robert Sesek [Fri, 16 Sep 2016 17:38:43 +0000 (17:38 +0000)]
Move art::Runtime::InitZygote logic from art into frameworks/base. am: b2267032bd
am: 8a0e2fd890

Change-Id: I582a0b028f40cf32e9723843d3c07bba00fa7923

7 years agoMerge "Move art::Runtime::InitZygote logic from art into frameworks/base."
Robert Sesek [Fri, 16 Sep 2016 17:32:51 +0000 (17:32 +0000)]
Merge "Move art::Runtime::InitZygote logic from art into frameworks/base."
am: c6eced06a8

Change-Id: Id2592a1cf90f82ac20bd383fd6cebdbd654a92e5

7 years agoMove art::Runtime::InitZygote logic from art into frameworks/base.
Robert Sesek [Fri, 16 Sep 2016 17:31:53 +0000 (17:31 +0000)]
Move art::Runtime::InitZygote logic from art into frameworks/base.
am: b2267032bd

Change-Id: Ie6462837f4bc0fb8bc4185e2e5413e868a3f03bd

7 years agoMerge "Move art::Runtime::InitZygote logic from art into frameworks/base."
Treehugger Robot [Fri, 16 Sep 2016 17:23:41 +0000 (17:23 +0000)]
Merge "Move art::Runtime::InitZygote logic from art into frameworks/base."

7 years agoMerge "x86/x86-64: Simplify codegen using helper functions." am: 22a99ff190 am: 98d2f...
Vladimir Marko [Fri, 16 Sep 2016 17:15:51 +0000 (17:15 +0000)]
Merge "x86/x86-64: Simplify codegen using helper functions." am: 22a99ff190 am: 98d2f8d294
am: b9d886bd26

Change-Id: If71ae2670cee233ba556a824ff5b6cb974eb7aca

7 years agoMerge "Fix build for VerifierDeps gtest on target" am: 4613f533a8 am: 2ebe6f88ba
David Brazdil [Fri, 16 Sep 2016 17:15:50 +0000 (17:15 +0000)]
Merge "Fix build for VerifierDeps gtest on target" am: 4613f533a8 am: 2ebe6f88ba
am: 3269208267

Change-Id: I69fd4280093d9b7619d9675d56f41a605ffe383d

7 years agoMerge "x86/x86-64: Simplify codegen using helper functions." am: 22a99ff190
Vladimir Marko [Fri, 16 Sep 2016 17:12:52 +0000 (17:12 +0000)]
Merge "x86/x86-64: Simplify codegen using helper functions." am: 22a99ff190
am: 98d2f8d294

Change-Id: I76b2d5881c90db7dd403fcf6cff765e919840f09

7 years agoMerge "Fix build for VerifierDeps gtest on target" am: 4613f533a8
David Brazdil [Fri, 16 Sep 2016 17:12:49 +0000 (17:12 +0000)]
Merge "Fix build for VerifierDeps gtest on target" am: 4613f533a8
am: 2ebe6f88ba

Change-Id: Icbab36394653443ebdfe705dbbea55a00c7abe03

7 years agoMerge "x86/x86-64: Simplify codegen using helper functions."
Vladimir Marko [Fri, 16 Sep 2016 17:09:50 +0000 (17:09 +0000)]
Merge "x86/x86-64: Simplify codegen using helper functions."
am: 22a99ff190

Change-Id: I132118d1b186fff07c7390ac85df5898e93a17f0

7 years agoMerge "Fix build for VerifierDeps gtest on target"
David Brazdil [Fri, 16 Sep 2016 17:09:49 +0000 (17:09 +0000)]
Merge "Fix build for VerifierDeps gtest on target"
am: 4613f533a8

Change-Id: I9a404a88a3338f5d7c6df4066134816fe6f39b97

7 years agoMerge "x86/x86-64: Simplify codegen using helper functions."
Treehugger Robot [Fri, 16 Sep 2016 17:07:31 +0000 (17:07 +0000)]
Merge "x86/x86-64: Simplify codegen using helper functions."

7 years agoMerge "Fix build for VerifierDeps gtest on target"
Treehugger Robot [Fri, 16 Sep 2016 17:05:16 +0000 (17:05 +0000)]
Merge "Fix build for VerifierDeps gtest on target"

7 years agox86/x86-64: Simplify codegen using helper functions.
Vladimir Marko [Fri, 16 Sep 2016 10:32:36 +0000 (11:32 +0100)]
x86/x86-64: Simplify codegen using helper functions.

Simplify comparisons and array element address calculations.

Test: m test-art-host
Change-Id: I2a3f54a3638cf4c24d9e3cac83daba47f0723f72

7 years agoFix build for VerifierDeps gtest on target
David Brazdil [Fri, 16 Sep 2016 15:33:31 +0000 (16:33 +0100)]
Fix build for VerifierDeps gtest on target

Forgot to specify the target for the .jar file.

Bug: 30937355
Change-Id: Id44bdeb91474d8acfdf9e9144da9a4c9f4c6cf55

7 years agoMerge "Implement VerifierDeps encoding/decoding" am: bbefcb3c8f am: 980e6a904a
David Brazdil [Fri, 16 Sep 2016 13:50:42 +0000 (13:50 +0000)]
Merge "Implement VerifierDeps encoding/decoding" am: bbefcb3c8f am: 980e6a904a
am: 68923fe3da

Change-Id: Ide7cb48e48c8f70d4adf318088af47a07c16f45b

7 years agoMerge "Implement VerifierDeps encoding/decoding" am: bbefcb3c8f
David Brazdil [Fri, 16 Sep 2016 13:48:27 +0000 (13:48 +0000)]
Merge "Implement VerifierDeps encoding/decoding" am: bbefcb3c8f
am: 980e6a904a

Change-Id: I3e964f01ce2b0bd249ff9fe1a5f8c5d63074f4af

7 years agoMerge "Implement VerifierDeps encoding/decoding"
David Brazdil [Fri, 16 Sep 2016 13:45:42 +0000 (13:45 +0000)]
Merge "Implement VerifierDeps encoding/decoding"
am: bbefcb3c8f

Change-Id: I803f79f06583505fee868cfab210847b5b3d7127

7 years agoMerge "Implement VerifierDeps encoding/decoding"
Treehugger Robot [Fri, 16 Sep 2016 13:37:32 +0000 (13:37 +0000)]
Merge "Implement VerifierDeps encoding/decoding"

7 years agoMerge "Add a phony target for golem." am: 31eb450500 am: a00349c155
Nicolas Geoffray [Fri, 16 Sep 2016 11:57:20 +0000 (11:57 +0000)]
Merge "Add a phony target for golem." am: 31eb450500 am: a00349c155
am: 790162da1a

Change-Id: Ia80e21a66f409ecc65774d9947a9ac80f859674a

7 years agoMerge "Add a phony target for golem." am: 31eb450500
Nicolas Geoffray [Fri, 16 Sep 2016 11:54:34 +0000 (11:54 +0000)]
Merge "Add a phony target for golem." am: 31eb450500
am: a00349c155

Change-Id: I84c9b34939ed649b7eb197230ee3c1ded0e0da61

7 years agoMerge "Add a phony target for golem."
Nicolas Geoffray [Fri, 16 Sep 2016 11:51:19 +0000 (11:51 +0000)]
Merge "Add a phony target for golem."
am: 31eb450500

Change-Id: I98cb017cecb25826698e92e732ab8b9ad76702da

7 years agoMerge "Add a phony target for golem."
Nicolas Geoffray [Fri, 16 Sep 2016 11:44:23 +0000 (11:44 +0000)]
Merge "Add a phony target for golem."

7 years agoAdd a phony target for golem.
Nicolas Geoffray [Fri, 16 Sep 2016 11:28:12 +0000 (12:28 +0100)]
Add a phony target for golem.

To cut down on the size of the build.

Change-Id: Ic7dce1f8b73cf234c3e0163a0c03c7e19d9b02e1

7 years agoMerge "Collect verifier dependencies" am: 031f3dd847 am: e0203d3b14
David Brazdil [Fri, 16 Sep 2016 11:14:43 +0000 (11:14 +0000)]
Merge "Collect verifier dependencies" am: 031f3dd847 am: e0203d3b14
am: 4759c29357

Change-Id: Ia16466e2f646d679ab179a4ad3c499c9e05430f3

7 years agoMerge "Collect verifier dependencies" am: 031f3dd847
David Brazdil [Fri, 16 Sep 2016 11:12:28 +0000 (11:12 +0000)]
Merge "Collect verifier dependencies" am: 031f3dd847
am: e0203d3b14

Change-Id: Ieb46028f2356b1df2729a65068470be7b9a2a953

7 years agoMerge "Collect verifier dependencies"
David Brazdil [Fri, 16 Sep 2016 11:09:47 +0000 (11:09 +0000)]
Merge "Collect verifier dependencies"
am: 031f3dd847

Change-Id: I5315199a9832d293d37b180d978bdd1531e2ea9b

7 years agoMerge "Collect verifier dependencies"
Treehugger Robot [Fri, 16 Sep 2016 11:02:13 +0000 (11:02 +0000)]
Merge "Collect verifier dependencies"

7 years agoImplement VerifierDeps encoding/decoding
David Brazdil [Wed, 14 Sep 2016 10:55:26 +0000 (11:55 +0100)]
Implement VerifierDeps encoding/decoding

This patch implements serialization and deserialization of the data
recorded by VerifierDeps.

Test: m test-art-host-gtest-verifier_deps_test
Bug: 30937355
Change-Id: I19320b8e70d5c5128653d09a5cdb5b6f677a2f2d

7 years agoCollect verifier dependencies
David Brazdil [Tue, 6 Sep 2016 13:04:48 +0000 (14:04 +0100)]
Collect verifier dependencies

MethodVerifier tests whether a DEX method is valid w.r.t. the classes
in class path. Since the APK does not change across OTA updates, it
is not necessary to analyze the bytecode again with MethodVerifier,
as long as its dependencies on the class path (which may have changed)
are satisfied.

This patch introduces VerifierDeps, a class path dependency collector,
and adds hooks into MethodVerifier where classes/methods/fields are
resolved and where assignability of types is tested.

Test: m test-art-host-gtest-verifier_deps_test
Bug: 30937355
Change-Id: Iee0b321d772a5c7d1cb471aaa6e13918310b7e2f

7 years agoMerge "test: Remove icu cleanup hack" am: 0764877e21 am: 1f2ef28d98
Igor Murashkin [Fri, 16 Sep 2016 08:13:14 +0000 (08:13 +0000)]
Merge "test: Remove icu cleanup hack" am: 0764877e21 am: 1f2ef28d98
am: c135d33cd4

Change-Id: I42d6b8836543e8ebea3192bce287476aeccc3798

7 years agoMerge "test: Remove icu cleanup hack" am: 0764877e21
Igor Murashkin [Fri, 16 Sep 2016 08:10:13 +0000 (08:10 +0000)]
Merge "test: Remove icu cleanup hack" am: 0764877e21
am: 1f2ef28d98

Change-Id: I9e49da9ff99867d1fcb9077ced939724130283e1

7 years agoMerge "test: Remove icu cleanup hack"
Igor Murashkin [Fri, 16 Sep 2016 08:07:43 +0000 (08:07 +0000)]
Merge "test: Remove icu cleanup hack"
am: 0764877e21

Change-Id: Iad7d8809f1fc3ba5d46368fd36f08577dbf8997a

7 years agoMerge "Fix 32-bit device tests" am: 2c92bf2340 am: f65e3cb2ad
Nicolas Geoffray [Fri, 16 Sep 2016 08:07:39 +0000 (08:07 +0000)]
Merge "Fix 32-bit device tests" am: 2c92bf2340 am: f65e3cb2ad
am: 59fafa2c6d

Change-Id: I29d5f13fc63dcce4e9aea75be979a714bc3a069b

7 years agoMerge "Fix HOST_PREFER_32_BITS tests" am: 6615375c90 am: bd2cd34a8d
Nicolas Geoffray [Fri, 16 Sep 2016 08:07:38 +0000 (08:07 +0000)]
Merge "Fix HOST_PREFER_32_BITS tests" am: 6615375c90 am: bd2cd34a8d
am: 937663b0ab

Change-Id: I3a7e17f1b28d17675ef793ece2461d85bc058153

7 years agoMerge "Fix 32-bit device tests" am: 2c92bf2340
Nicolas Geoffray [Fri, 16 Sep 2016 08:04:40 +0000 (08:04 +0000)]
Merge "Fix 32-bit device tests" am: 2c92bf2340
am: f65e3cb2ad

Change-Id: I125abfa348ce5bf47ea94bd2c644f1de18e264ec

7 years agoMerge "Fix HOST_PREFER_32_BITS tests" am: 6615375c90
Nicolas Geoffray [Fri, 16 Sep 2016 08:04:39 +0000 (08:04 +0000)]
Merge "Fix HOST_PREFER_32_BITS tests" am: 6615375c90
am: bd2cd34a8d

Change-Id: I9a9e918a0c1215b38850254b0f606b3d335bf808

7 years agoMerge "test: Remove icu cleanup hack"
Treehugger Robot [Fri, 16 Sep 2016 08:04:15 +0000 (08:04 +0000)]
Merge "test: Remove icu cleanup hack"

7 years agoMerge "Fix 32-bit device tests"
Nicolas Geoffray [Fri, 16 Sep 2016 08:02:08 +0000 (08:02 +0000)]
Merge "Fix 32-bit device tests"
am: 2c92bf2340

Change-Id: I3ecc880064de5a71237761445dcb2bafa41f9c11

7 years agoMerge "Fix HOST_PREFER_32_BITS tests"
Nicolas Geoffray [Fri, 16 Sep 2016 08:02:07 +0000 (08:02 +0000)]
Merge "Fix HOST_PREFER_32_BITS tests"
am: 6615375c90

Change-Id: I81d5706719d1b758d6fae72a45379f94e19d144b

7 years agoMerge "Fix 32-bit device tests"
Nicolas Geoffray [Fri, 16 Sep 2016 07:57:14 +0000 (07:57 +0000)]
Merge "Fix 32-bit device tests"

7 years agoMerge "Fix HOST_PREFER_32_BITS tests"
Nicolas Geoffray [Fri, 16 Sep 2016 07:55:57 +0000 (07:55 +0000)]
Merge "Fix HOST_PREFER_32_BITS tests"

7 years agoFix 32-bit device tests
Colin Cross [Fri, 16 Sep 2016 04:07:29 +0000 (21:07 -0700)]
Fix 32-bit device tests

32-bit tests are installed to /data/nativetest, not /data/nativetest32.

Test: m -j test-art-target-gtest32
Change-Id: I2736d6783dd34550dbfbbe54ffa724cd2b886d8b

7 years agoFix HOST_PREFER_32_BITS tests
Colin Cross [Fri, 16 Sep 2016 03:57:47 +0000 (20:57 -0700)]
Fix HOST_PREFER_32_BITS tests

When HOST_PREFER_32_BITS is set, HOST_ARCH is still x86_64 but art tests
are only built for x86.  Use ART_HOST_ARCH, which will be set to x86,
to find the list of host tests.

Test: m -j HOST_PREFER_32_BITS=true test-art-host-gtest32
Change-Id: I11a9e1b5111c3c06139b44e364fdcd04bb8db4c6

7 years agoMerge "Fix mac build" am: 175a9be49d am: ec2f94c40a
Colin Cross [Fri, 16 Sep 2016 01:09:20 +0000 (01:09 +0000)]
Merge "Fix mac build" am: 175a9be49d am: ec2f94c40a
am: 5f8236a2ac

Change-Id: Ie6bbb9bb82f417598f9d066794e1a4c03ba180e9

7 years agoMerge "Fix mac build" am: 175a9be49d
Colin Cross [Fri, 16 Sep 2016 01:06:50 +0000 (01:06 +0000)]
Merge "Fix mac build" am: 175a9be49d
am: ec2f94c40a

Change-Id: Idd7bd9c0be8aec76e4dc79e70bfc227f6374de65

7 years agoMerge "Fix mac build"
Colin Cross [Fri, 16 Sep 2016 01:04:19 +0000 (01:04 +0000)]
Merge "Fix mac build"
am: 175a9be49d

Change-Id: I57ec257f1b84fffc9e201953981e2ac4a12e4fd0

7 years agoFix a deadlock in the CC collector.
Hiroshi Yamauchi [Thu, 15 Sep 2016 02:31:25 +0000 (19:31 -0700)]
Fix a deadlock in the CC collector.

Fix a deadlock between CC GC disabling system weaks and thread attach.

See 31500969#2 for more details.

Bug: 31500969
Bug: 12687968
Test: test-art-host with CC. N9 libartd boot. Ritz EAAC.
Change-Id: Ic9a8bfb1c636643a03f4580b811fe890273576b6

7 years agoMerge "Fix mac build"
Treehugger Robot [Fri, 16 Sep 2016 00:57:34 +0000 (00:57 +0000)]
Merge "Fix mac build"

7 years agoMerge "Avoid using memcpy for object header in ConcurrentCopying::Copy" am: c8651471a...
Mathieu Chartier [Thu, 15 Sep 2016 23:51:06 +0000 (23:51 +0000)]
Merge "Avoid using memcpy for object header in ConcurrentCopying::Copy" am: c8651471ab am: 8c1dac4ebf
am: 49dc84f775

Change-Id: I8d3bc4259322888989c50d71e6d158cb6f910e93

7 years agoMerge "Avoid using memcpy for object header in ConcurrentCopying::Copy" am: c8651471ab
Mathieu Chartier [Thu, 15 Sep 2016 23:49:06 +0000 (23:49 +0000)]
Merge "Avoid using memcpy for object header in ConcurrentCopying::Copy" am: c8651471ab
am: 8c1dac4ebf

Change-Id: I210a22b2eb2269deaad633a9856deadf9d813de7

7 years agoMerge "Avoid using memcpy for object header in ConcurrentCopying::Copy"
Mathieu Chartier [Thu, 15 Sep 2016 23:46:35 +0000 (23:46 +0000)]
Merge "Avoid using memcpy for object header in ConcurrentCopying::Copy"
am: c8651471ab

Change-Id: I72b035ec5714413040c3cea6e13fac6ca0876641

7 years agoMerge "Avoid using memcpy for object header in ConcurrentCopying::Copy"
Mathieu Chartier [Thu, 15 Sep 2016 23:41:17 +0000 (23:41 +0000)]
Merge "Avoid using memcpy for object header in ConcurrentCopying::Copy"

7 years agoFix mac build
Colin Cross [Thu, 15 Sep 2016 23:24:51 +0000 (16:24 -0700)]
Fix mac build

I accidentally dropped the hunks that disabled the mac build when
rebasing.

Change-Id: I412325f71c4bfde7a357b50daeb966e6db32c388

7 years agoMerge changes from topic 'art_tests' am: 7d26164308 am: 6ccebc29a6
Colin Cross [Thu, 15 Sep 2016 21:58:07 +0000 (21:58 +0000)]
Merge changes from topic 'art_tests' am: 7d26164308 am: 6ccebc29a6
am: 4c3ce12932

Change-Id: Ic8d5981def5f3b4d7fb72f155a0abd61ea33e835

7 years agoConvert art gtests to Android.bp am: 6e95dd56e4 am: 77f44de43d
Colin Cross [Thu, 15 Sep 2016 21:57:54 +0000 (21:57 +0000)]
Convert art gtests to Android.bp am: 6e95dd56e4 am: 77f44de43d
am: 99a79dc0b3

Change-Id: I205f01f3947f7b87d2c4c13b6254d2a3cddce19e

7 years agoConvert libart-gtest to Android.bp am: 6b22aa5106 am: 7be55782bc
Colin Cross [Thu, 15 Sep 2016 21:57:42 +0000 (21:57 +0000)]
Convert libart-gtest to Android.bp am: 6b22aa5106 am: 7be55782bc
am: 031cf96d08

Change-Id: I387abe504282d418b29e61dd39fce0b55f103310

7 years agoMerge changes from topic 'art_tests' am: 7d26164308
Colin Cross [Thu, 15 Sep 2016 21:55:08 +0000 (21:55 +0000)]
Merge changes from topic 'art_tests' am: 7d26164308
am: 6ccebc29a6

Change-Id: Ib40f6e36e7de74d3f37ee8c305ebcfdd0c9caae4

7 years agoConvert art gtests to Android.bp am: 6e95dd56e4
Colin Cross [Thu, 15 Sep 2016 21:54:57 +0000 (21:54 +0000)]
Convert art gtests to Android.bp am: 6e95dd56e4
am: 77f44de43d

Change-Id: I9a4db7d08bd56579271717bfc400fda03e58fa2d

7 years agoConvert libart-gtest to Android.bp am: 6b22aa5106
Colin Cross [Thu, 15 Sep 2016 21:54:46 +0000 (21:54 +0000)]
Convert libart-gtest to Android.bp am: 6b22aa5106
am: 7be55782bc

Change-Id: I28282f33897d63efc1e5ee9a4b19118f2532265f

7 years agoAvoid using memcpy for object header in ConcurrentCopying::Copy
Mathieu Chartier [Thu, 15 Sep 2016 20:12:47 +0000 (13:12 -0700)]
Avoid using memcpy for object header in ConcurrentCopying::Copy

Memcpy can do per byte copy, this occasionally caused tearing in
the lockword when read from the source resulting in incorrect
values.

Test: test-art-host CC baker

Bug: 31423258
Change-Id: I13f856835125a3aa331530fb1f16db45d1955c8a

7 years agoMerge changes from topic 'art_tests'
Colin Cross [Thu, 15 Sep 2016 21:52:27 +0000 (21:52 +0000)]
Merge changes from topic 'art_tests'
am: 7d26164308

Change-Id: I64cfdc5ea42dd9f439129c106fbc814f38eb192b

7 years agoConvert art gtests to Android.bp
Colin Cross [Thu, 15 Sep 2016 21:52:25 +0000 (21:52 +0000)]
Convert art gtests to Android.bp
am: 6e95dd56e4

Change-Id: I2cb2e32e4ce446a4cbb6776f0a8b81d5b67d0b7d

7 years agoConvert libart-gtest to Android.bp
Colin Cross [Thu, 15 Sep 2016 21:52:14 +0000 (21:52 +0000)]
Convert libart-gtest to Android.bp
am: 6b22aa5106

Change-Id: Ib3f8198e9a6c84527cd50353a52be7bdbea398bd

7 years agoMerge changes from topic 'art_tests'
Colin Cross [Thu, 15 Sep 2016 21:47:07 +0000 (21:47 +0000)]
Merge changes from topic 'art_tests'

* changes:
  Convert art gtests to Android.bp
  Convert libart-gtest to Android.bp

7 years agoMerge "Fix run_java_fuzz_test.py imports" am: 669cfcd570 am: 55b1ad0ea6
Wojciech Staszkiewicz [Thu, 15 Sep 2016 21:43:47 +0000 (21:43 +0000)]
Merge "Fix run_java_fuzz_test.py imports" am: 669cfcd570 am: 55b1ad0ea6
am: ec253dd5af

Change-Id: I63ec71f904aaadf347ad66f3276d2d90f18fa315

7 years agoMerge "Fix run_java_fuzz_test.py imports" am: 669cfcd570
Wojciech Staszkiewicz [Thu, 15 Sep 2016 21:41:11 +0000 (21:41 +0000)]
Merge "Fix run_java_fuzz_test.py imports" am: 669cfcd570
am: 55b1ad0ea6

Change-Id: Id35d761712beb65abed0ff5c307da88eccbbaf9a

7 years agoMerge "Fix run_java_fuzz_test.py imports"
Wojciech Staszkiewicz [Thu, 15 Sep 2016 21:38:11 +0000 (21:38 +0000)]
Merge "Fix run_java_fuzz_test.py imports"
am: 669cfcd570

Change-Id: I257360044e58e5cbddcfd54e8038cb1b71d77c09

7 years agoMerge "Fix run_java_fuzz_test.py imports"
Treehugger Robot [Thu, 15 Sep 2016 21:29:35 +0000 (21:29 +0000)]
Merge "Fix run_java_fuzz_test.py imports"

7 years agoAdd a comment to dex2oat's parent pid logging
Wojciech Staszkiewicz [Thu, 15 Sep 2016 17:30:30 +0000 (10:30 -0700)]
Add a comment to dex2oat's parent pid logging

Adds a comment explaining why we are logging parent pid in dex2oat.

Test: mm -j
Change-Id: I6ed56bb9315a264e8f3d98777e616c4c9e544506

7 years agoMerge "Minor edits in javafuzz" am: 2de29f1626 am: fb606e337f
Aart Bik [Thu, 15 Sep 2016 19:53:55 +0000 (19:53 +0000)]
Merge "Minor edits in javafuzz" am: 2de29f1626 am: fb606e337f
am: 2ebbc64e10

Change-Id: I9e016d9d28b6ce94ad369fe0d9c15b9118b6230f

7 years agoMerge "Minor edits in javafuzz" am: 2de29f1626
Aart Bik [Thu, 15 Sep 2016 19:51:20 +0000 (19:51 +0000)]
Merge "Minor edits in javafuzz" am: 2de29f1626
am: fb606e337f

Change-Id: Idf5710641c55f685f0ed5074a82ecac8f4656fff

7 years agoMerge "Minor edits in javafuzz"
Aart Bik [Thu, 15 Sep 2016 19:48:51 +0000 (19:48 +0000)]
Merge "Minor edits in javafuzz"
am: 2de29f1626

Change-Id: I55e9702655cbfbf51d6b7b55dfd83186c5e49c8a

7 years agoMerge "Minor edits in javafuzz"
Treehugger Robot [Thu, 15 Sep 2016 19:42:30 +0000 (19:42 +0000)]
Merge "Minor edits in javafuzz"

7 years agoFix run_java_fuzz_test.py imports
Wojciech Staszkiewicz [Thu, 15 Sep 2016 18:41:16 +0000 (11:41 -0700)]
Fix run_java_fuzz_test.py imports

Make imports works independently of directory the tool is called
from.

Test: run_java_fuzz_test.py

Change-Id: I28cd875948e3e5e58358ecfd6f41e63b808172c9

7 years agoConvert art gtests to Android.bp
Colin Cross [Mon, 12 Sep 2016 22:37:10 +0000 (15:37 -0700)]
Convert art gtests to Android.bp

This splits the compilation and running of the art gtests into two
separate locations.  The tests are now compiled in multiple Android.bp
modules in each directory.  art.go collects the installed locations of
each test and exports it as make variables.  art/build/Android.gtest.mk
converts the list into the rules to run the tests.

This has a few changes in behavior:
  - The rules to build tests are now always defined, and will build as
    part of mmma art or make checkbuild.
  - Host tests are no longer installed into out/host/linux-x86/bin, they
    are in out/host/linux-x86/nativetest[64]/<module name>/<test name>
  - Target tests are now in
    /data/nativetest[64]/art/<arch>/<module name>/<test name>

Test: mmma -j art
Test: m -j test-art-host
Test: m -j test-art-target
Change-Id: Iabcd99d43890e6b693688422b07a283c3226a496

7 years agoConvert libart-gtest to Android.bp
Colin Cross [Mon, 12 Sep 2016 21:35:39 +0000 (14:35 -0700)]
Convert libart-gtest to Android.bp

Change-Id: Ibea17e3e002e6ad3f82158cd3c69d087fa9b15c9

7 years agoMerge "Fix google-explicit-constructor warnings in art." am: 6b4d988feb am: f6bda8278e
Chih-hung Hsieh [Thu, 15 Sep 2016 18:28:25 +0000 (18:28 +0000)]
Merge "Fix google-explicit-constructor warnings in art." am: 6b4d988feb am: f6bda8278e
am: fe26394365

Change-Id: Ia868781b3845545298574599ad1c3e386213c32a

7 years agoMerge "Fix google-explicit-constructor warnings in art." am: 6b4d988feb
Chih-hung Hsieh [Thu, 15 Sep 2016 18:25:55 +0000 (18:25 +0000)]
Merge "Fix google-explicit-constructor warnings in art." am: 6b4d988feb
am: f6bda8278e

Change-Id: Ibf7c661aa4125d1c1c7dfe26d6a9d8be69c0d9f7

7 years agoMerge "Fix google-explicit-constructor warnings in art."
Chih-hung Hsieh [Thu, 15 Sep 2016 18:23:24 +0000 (18:23 +0000)]
Merge "Fix google-explicit-constructor warnings in art."
am: 6b4d988feb

Change-Id: I7b077106056073983a5ceb975d483ed72d83350f