From 38cd0624f3fd60e437850d4b22bbd63960d3deea Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Thu, 4 Feb 2021 09:55:57 +0000 Subject: [PATCH] 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 --- core/dex_preopt_config_merger.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/dex_preopt_config_merger.py b/core/dex_preopt_config_merger.py index ebb99e196..1bd151982 100755 --- a/core/dex_preopt_config_merger.py +++ b/core/dex_preopt_config_merger.py @@ -72,8 +72,6 @@ def main(): clc = clcs[lib] if lib in uses_libs: 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. clc['Device'] = ulib['DexLocation'] # CLC of the dependency becomes a subcontext. We only need sub-CLC for