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 /target | |
| 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 'target')
| -rw-r--r-- | target/product/core.mk | 2 | ||||
| -rw-r--r-- | target/product/mini.mk | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/target/product/core.mk b/target/product/core.mk index 0e7aad6..c0ab6e0 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -72,6 +72,7 @@ PRODUCT_PACKAGES += \ libwebrtc_audio_preprocessing \ mdnsd \ mms-common \ + okhttp \ requestsync \ telephony-common \ voip-common @@ -82,6 +83,7 @@ ifeq ($(WITH_HOST_DALVIK),true) apache-xml-hostdex \ bouncycastle-hostdex \ core-hostdex \ + okhttp-hostdex \ libcrypto \ libexpat \ libicui18n \ diff --git a/target/product/mini.mk b/target/product/mini.mk index 751b481..16a2b8f 100644 --- a/target/product/mini.mk +++ b/target/product/mini.mk @@ -144,6 +144,7 @@ PRODUCT_PACKAGES += \ libz \ mdnsd \ network \ + okhttp \ pand \ requestsync \ screencap \ |