diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-04-03 14:19:26 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-04-03 14:19:26 -0700 |
| commit | 712676772b0d6e32bdce3430eed0a4d9771aac7e (patch) | |
| tree | 2782086c81b38d7cb29f49c130bbead8e0c8bb8f /core/dex_preopt.mk | |
| parent | fe15b4dad3538fbcbdea3a09243a5f25d3718b3e (diff) | |
| parent | 5ec66d15428e595934c9f0d9e26ea2234d545dbd (diff) | |
| download | build-712676772b0d6e32bdce3430eed0a4d9771aac7e.zip build-712676772b0d6e32bdce3430eed0a4d9771aac7e.tar.gz build-712676772b0d6e32bdce3430eed0a4d9771aac7e.tar.bz2 | |
resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
Diffstat (limited to 'core/dex_preopt.mk')
| -rw-r--r-- | core/dex_preopt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 82dd153..2d26b33 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -4,7 +4,7 @@ #################################### # TODO: replace it with device's BOOTCLASSPATH -DEXPREOPT_BOOT_JARS := core:core-junit:bouncycastle:ext:framework:telephony-common:voip-common:mms-common:android.policy:services:apache-xml +DEXPREOPT_BOOT_JARS := core:okhttp:core-junit:bouncycastle:ext:framework:telephony-common:voip-common:mms-common:android.policy:services:apache-xml DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS)) DEXPREOPT_BUILD_DIR := $(OUT_DIR) |