commit df55e5b26b6b7cc90f9487cb0489cee1ed430d39
author Alex Klyubin <klyubin@google.com> Mon Jul 28 17:14:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 28 17:14:55 2014 +0000
tree 64e65729c7f3529895cf1fd3d30f4ff5d82be9bd
parent 85ed0e10781c3c57343300a02556dd5131c450aa
parent f7a2b81e12cac8d9c11ddace681816942b6c6921

am f7a2b81e: am 6e294b4e: am aeb8a635: am 945aab57: am a8283f02: am b260a116: Stricter subject DN parsing for HTTPS hostname verification.

* commit 'f7a2b81e12cac8d9c11ddace681816942b6c6921':
  Stricter subject DN parsing for HTTPS hostname verification.

Android.mk

diff --git a/Android.mk b/Android.mk
index 25f5027..82bd472 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,11 +16,9 @@
 LOCAL_PATH:= $(call my-dir)
 # frameworks builds apache-http as part of ext.jar for the device, but
 # here we just build apache-http alone for the host build
-ifeq ($(WITH_HOST_DALVIK),true)
-    include $(CLEAR_VARS)
-    LOCAL_MODULE := apachehttp-hostdex
-    LOCAL_MODULE_TAGS := optional
-    LOCAL_SRC_FILES := $(call all-java-files-under,src)
-    LOCAL_MODULE_TAGS := optional
-    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
-endif
+include $(CLEAR_VARS)
+LOCAL_MODULE := apachehttp-hostdex
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(call all-java-files-under,src)
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)