SDK: Extract find_java static library.
Change-Id: Ic8b2130a327d73c044c0931509385aed19f78a9e
diff --git a/sdkmanager/win_android/Android.mk b/sdkmanager/win_android/Android.mk
index a50b3c7..2f111a0 100644
--- a/sdkmanager/win_android/Android.mk
+++ b/sdkmanager/win_android/Android.mk
@@ -1,13 +1,27 @@
# Copyright 2011 The Android Open Source Project
#
# Android.mk for sdkmanager/win_android
-#
-# This provides "win_android.exe", a replacement for "android.bat" for Windows only.
-#----- The current C++ sdklauncher -----
-
LOCAL_PATH := $(call my-dir)
+
+# find_java static library for host
+# ========================================================
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libfindjava
+LOCAL_SRC_FILES := find_java.cpp utils.cpp
+
+LOCAL_CFLAGS += -Wall -Wno-unused-parameter
+LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -DSH_HISTORY -DUSE_MINGW
+
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+
+# "win_android.exe", a host replacement for "android.bat". For the Windows SDK only.
+# ========================================================
+
include $(CLEAR_VARS)
ifeq ($(HOST_OS),windows)
@@ -15,9 +29,11 @@
LOCAL_SRC_FILES := \
win_android.cpp
+LOCAL_MODULE := win_android
+LOCAL_STATIC_LIBRARIES := libfindjava
+
LOCAL_CFLAGS += -Wall -Wno-unused-parameter
LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE -DSH_HISTORY -DUSE_MINGW
-LOCAL_MODULE := win_android
LOCAL_MODULE_TAGS := optional