diff options
| author | 2021-04-23 19:21:53 +0100 | |
|---|---|---|
| committer | 2021-04-26 22:03:50 +0000 | |
| commit | 8a70dd85c6beff0a434406769c7a2688f79ea6fe (patch) | |
| tree | 0f07fb0a340a188788b7f33681d95b31bda76159 | |
| parent | bb550e415da77e7e21c8f800657984c145bb42e1 (diff) | |
Add contents property to art-bootclasspath-fragment
Adds coverage properties too so that the contents are consistent with
the configuration even when EMMA_INSTRUMENT_FRAMEWORK=true.
Bug: 177892522
Test: m nothing
m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true nothing
Change-Id: I2060c99c510a36dfbfce57dfd72b336841ff1ff3
| -rw-r--r-- | build/boot/Android.bp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/build/boot/Android.bp b/build/boot/Android.bp index ca6ab24d05..42ed020d1a 100644 --- a/build/boot/Android.bp +++ b/build/boot/Android.bp @@ -24,6 +24,21 @@ package { bootclasspath_fragment { name: "art-bootclasspath-fragment", image_name: "art", + // Must match the ART_APEX_JARS set in build/make/core/envsetup.mk + contents: [ + "core-oj", + "core-libart", + "okhttp", + "bouncycastle", + "apache-xml", + ], + // Additional properties to append when coverage is enabled, i.e. when + // EMMA_INSTRUMENT_FRAMEWORK=true + coverage: { + contents: [ + "jacocoagent", + ], + }, visibility: [ "//art/build/apex", "//art/build/sdk", |