| commit | 3ce7ea968f6192e7c267be0374e459143394a921 | [log] [tgz] |
|---|---|---|
| author | Ulyana Trafimovich <skvadrik@google.com> | Fri Feb 05 12:13:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 05 12:13:43 2021 +0000 |
| tree | 001796a32193a74e3c41732e3a96bfc4e6bc55ef | |
| parent | 7d8e95506e23ac18e117f8efacb8903131c7428d [diff] | |
| parent | 14bd7995f9a04d4433307eb426f1f7e681b4e5d0 [diff] |
Merge "Don't patch build path to DEX jar in dex_preopt_config_merger.py." am: 966928196d am: 14bd7995f9 Original change: https://android-review.googlesource.com/c/platform/build/+/1574724 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ac9c36c47133a086bdbb729829f64e8433be6d4
diff --git a/core/dex_preopt_config_merger.py b/core/dex_preopt_config_merger.py index ebb99e1..1bd1519 100755 --- a/core/dex_preopt_config_merger.py +++ b/core/dex_preopt_config_merger.py
@@ -72,8 +72,6 @@ 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