openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Don't patch build path to DEX jar in dex_preopt_config_merger.py. 

The initial path value is correct, there's no need to patch it.

Bug: 132357300
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'
        # empty grep output, no errors
Change-Id: Iaa9171e7db348ad469ec56b977b5f2226f353284
This commit is contained in:
Ulya Trafimovich 2021-02-04 09:55:57 +00:00
parent 015fd9e71b
commit 38cd0624f3
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/dex_preopt_config_merger.py
View File

@ -72,8 +72,6 @@ def main():
clc = clcs[lib] clc = clcs[lib]
if lib in uses_libs: if lib in uses_libs:
ulib = uses_libs[lib] ulib = uses_libs[lib]
# On-host (build) path to the dependency DEX jar file.
clc['Host'] = ulib['BuildPath']
# On-device (install) path to the dependency DEX jar file. # On-device (install) path to the dependency DEX jar file.
clc['Device'] = ulib['DexLocation'] clc['Device'] = ulib['DexLocation']
# CLC of the dependency becomes a subcontext. We only need sub-CLC for # CLC of the dependency becomes a subcontext. We only need sub-CLC for