commit 0f1e79b33591d98a93678a8f8e93ebff20a061c3
author The Android Open Source Project <initial-contribution@android.com> Fri May 20 13:24:36 2011 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri May 20 13:24:36 2011 -0700
tree 3bd345750b7153fd14720f5379ac68840832ff62
parent 1a1028467afdc5c0171bd4d9cade62e579316f72
parent a019bea8eb4c0bb0494db47e7388c5401e9bc380

Reconcile with honeycomb-release

Change-Id: I894d810dbc4d37fe09a2f5e1ae8e9dd7dfbba152

Android.mk

diff --git a/Android.mk b/Android.mk
index 8cc23ce..4605fe6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,14 @@
+# -*- mode: makefile -*-
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := sqlite-jdbc
+include $(BUILD_STATIC_JAVA_LIBRARY)
 
 sqlite_jdbc_src_files := \
     src/main/native/sqlite_jni.c
@@ -5,9 +16,6 @@
     $(JNI_H_INCLUDE) \
     external/sqlite/dist
 
-
-LOCAL_PATH := $(call my-dir)
-
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(sqlite_jdbc_src_files)
 LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes)
@@ -20,6 +28,15 @@
 
 ifeq ($(WITH_HOST_DALVIK),true)
     include $(CLEAR_VARS)
+    LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
+    LOCAL_NO_STANDARD_LIBRARIES := true
+    LOCAL_JAVA_LIBRARIES := core-hostdex
+    LOCAL_JAVACFLAGS := $(local_javac_flags)
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_MODULE := sqlite-jdbc-host
+    include $(BUILD_HOST_JAVA_LIBRARY)
+
+    include $(CLEAR_VARS)
     LOCAL_SRC_FILES := $(sqlite_jdbc_src_files)
     LOCAL_C_INCLUDES += $(sqlite_jdbc_local_c_includes)
     LOCAL_SHARED_LIBRARIES += libsqlite