diff options
author | Jeongik Cha <jeongik@google.com> | 2021-07-19 14:46:59 +0000 |
---|---|---|
committer | Jeongik Cha <jeongik@google.com> | 2021-07-19 14:46:59 +0000 |
commit | cdf32dd53e51c1037ce66776f98ce543a96c3056 (patch) | |
tree | ef28a4924ab606acc23a8e692418d803817bc136 /java/java.go | |
parent | f0dd5152a12c045deb95609ef47da5e6cd7c13be (diff) |
Fix handling of "prebuilt_" prefix in classLoaderContextForUsesLibDeps.
Changes:
- Cut off "prebuilt_" prefix from `dep`, not `libName`, because `dep` is
used to replace library name in `usesLibraryProperties`, and these
properties are specified without "prebuilt_" prefix.
- Do not remove "prebuilt_" prefix on the return value of
`ProvidesUsesLib()`: this boils down to `provides_uses_lib` property
which is specified without the prefix.
Bug: 193425964
Test: $ lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd
$ adb wait-for-device && \
adb root && \
adb logcat | \
grep -E 'ClassLoaderContext [a-z ]+ mismatch' -C1
# empty output, no errors
(cherry-picked from aosp/1768131)
Change-Id: I6cb65040027023d12ca0bc132d60c2c245174c40
Diffstat (limited to 'java/java.go')
0 files changed, 0 insertions, 0 deletions