commit 37a816a09d0b075033bf81c7787a5037430f430d
author Brian Carlstrom <bdc@google.com> Fri Mar 18 12:52:04 2011 -0700
committer Brian Carlstrom <bdc@google.com> Fri Mar 18 15:43:27 2011 -0700
tree e2a55e816880b41e422f2a4b01153092ce6ded19
parent f34b0233fe5d94c82c2a2b3a1eeda4d42a5598b8

Move sqlite-jdbc to be a static library

Change-Id: If02a0973eb7ba0291a75397dda5f221b810890de

Android.mk

diff --git a/Android.mk b/Android.mk
index d9e4b71..a51a7a1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,5 +49,5 @@
 
 ifeq ($(WITH_HOST_DALVIK),true)
     .PHONY: dalvik-host
-    dalvik-host: $(HOST_OUT)/bin/dalvikvm $(HOST_OUT)/bin/dexopt $(HOST_OUT)/lib/libsqlite.so $(HOST_OUT)/etc/security/cacerts.bks $(HOST_OUT)/usr/share/zoneinfo/zoneinfo.dat $(HOST_OUT)/usr/share/zoneinfo/zoneinfo.idx $(HOST_OUT)/usr/share/zoneinfo/zoneinfo.version core-hostdex bouncycastle-hostdex apache-xml-hostdex $(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,COMMON)/classes.jar
+    dalvik-host: dalvik $(HOST_OUT)/bin/dalvikvm $(HOST_OUT)/bin/dexopt $(HOST_OUT)/lib/libsqlite.so $(HOST_OUT)/etc/security/cacerts.bks $(HOST_OUT)/usr/share/zoneinfo/zoneinfo.dat $(HOST_OUT)/usr/share/zoneinfo/zoneinfo.idx $(HOST_OUT)/usr/share/zoneinfo/zoneinfo.version core-hostdex bouncycastle-hostdex apache-xml-hostdex $(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,COMMON)/classes.jar
 endif

JavaLibrary.mk

diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 11fcb82..d4afcd2 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -103,7 +103,8 @@
 LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni support xml)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit sqlite-jdbc
+LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit
+LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc
 LOCAL_DX_FLAGS := --core-library
 LOCAL_JAVACFLAGS := $(local_javac_flags)
 LOCAL_MODULE_TAGS := tests
@@ -169,7 +170,8 @@
     LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni support xml)
     LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
     LOCAL_NO_STANDARD_LIBRARIES := true
-    LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex sqlite-jdbc-hostdex
+    LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex
+    LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host
     LOCAL_DX_FLAGS := --core-library
     LOCAL_JAVACFLAGS := $(local_javac_flags)
     LOCAL_MODULE_TAGS := tests