Support dalvikvm on a Linux x86 host

Change-Id: Id166ab03a01833e06ec1a9aa0059e4eb28ec04ce

1 files changed, 14 insertions, 25 deletions

diff --git a/Android.mk b/Android.mk
index 2acc869..b2056c6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,29 +20,26 @@ LOCAL_PATH := $(call my-dir)
 #
 
 src_files := \
-	JNIHelp.c \
-	Register.c
+    JNIHelp.c \
+    Register.c
 
 c_includes := \
-	$(JNI_H_INCLUDE)
+    $(JNI_H_INCLUDE)
 
 # Any shared/static libs required by libjavacore
 # need to be mentioned here as well.
 # TODO: fix this requirement
 
 shared_libraries := \
-	libexpat \
-	libssl \
-	libutils \
-	libz \
-	libcrypto  \
-	libicuuc   \
-	libicui18n \
-	libsqlite
+    libcrypto  \
+    libicui18n \
+    libicuuc   \
+    libsqlite \
+    libssl
 
 static_libraries := \
-	libjavacore \
-	libfdlibm
+    libjavacore \
+    libfdlibm
 
 
 
@@ -55,11 +52,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(src_files)
 LOCAL_C_INCLUDES := $(c_includes)
 LOCAL_STATIC_LIBRARIES := $(static_libraries)
-LOCAL_SHARED_LIBRARIES := $(shared_libraries)
-
-# liblog and libcutils are shared for target.
-LOCAL_SHARED_LIBRARIES += \
-	liblog libcutils
+LOCAL_SHARED_LIBRARIES := $(shared_libraries) libcutils libexpat liblog libutils libz
 
 LOCAL_MODULE := libnativehelper
 
@@ -82,17 +75,13 @@ ifeq ($(WITH_HOST_DALVIK),true)
         # OSX has a lot of libraries built in, which we don't have to
         # bother building; just include them on the ld line.
         LOCAL_LDLIBS := -lexpat -lssl -lz -lcrypto -licucore -lsqlite3
-	LOCAL_WHOLE_STATIC_LIBRARIES += libutils
+        LOCAL_WHOLE_STATIC_LIBRARIES += libutils
     else
         LOCAL_SHARED_LIBRARIES := $(shared_libraries)
+        LOCAL_STATIC_LIBRARIES := libcutils libexpat liblog libutils libz
     endif
 
-    # liblog and libcutils are static for host.
-    LOCAL_STATIC_LIBRARIES += \
-        liblog libcutils
-
-    LOCAL_MODULE := libnativehelper-host
-
+    LOCAL_MODULE := libnativehelper
     include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif