commit cdfdba3704665064a474d46658675e55fa80325f
author Narayan Kamath <narayan@google.com> Wed Jan 07 10:21:25 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 07 10:21:25 2015 +0000
tree 4da77ba12bda3f613e274d05c8b9e24c4e406684
parent 1a59057d02eca1caa7d41b5ceec7e497cb1171db
parent f4f9026a57d8f935bb1be562654c97d454a4e446

am f4f9026a: am 686cfbde: Merge "Build okhttp-hostdex only on linux hosts."

* commit 'f4f9026a57d8f935bb1be562654c97d454a4e446':
  Build okhttp-hostdex only on linux hosts.

Android.mk

diff --git a/Android.mk b/Android.mk
index 1f2a330..cb5adf6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -57,6 +57,7 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+ifeq ($(HOST_OS),linux)
 include $(CLEAR_VARS)
 LOCAL_MODULE := okhttp-hostdex
 LOCAL_MODULE_TAGS := optional
@@ -66,3 +67,4 @@
 LOCAL_JAVA_LIBRARIES := conscrypt-hostdex
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+endif  # ($(HOST_OS),linux)