diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-03-17 21:14:10 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-03-17 21:14:10 -0700 |
| commit | f34b0233fe5d94c82c2a2b3a1eeda4d42a5598b8 (patch) | |
| tree | 011c9f99497202247e451e4a5c84aeec4d7c17ae /JavaLibrary.mk | |
| parent | a879e74388e30203ad94719723b455f1367303cf (diff) | |
| parent | b5d9f82ac737ab4a464ba1506713572dea3d5f9d (diff) | |
| download | libcore-f34b0233fe5d94c82c2a2b3a1eeda4d42a5598b8.zip libcore-f34b0233fe5d94c82c2a2b3a1eeda4d42a5598b8.tar.gz libcore-f34b0233fe5d94c82c2a2b3a1eeda4d42a5598b8.tar.bz2 | |
resolved conflicts for merge of b5d9f82a to dalvik-dev
Change-Id: Iad4368d3d4974406c610e432bb3dfde411135176
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index cd2736f..11fcb82 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -98,16 +98,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-junit include $(BUILD_JAVA_LIBRARY) -# Make the sqlite JDBC driver. -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-main-java-files-under,sqlite-jdbc) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core -LOCAL_JAVACFLAGS := $(local_javac_flags) -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := sqlite-jdbc -include $(BUILD_JAVA_LIBRARY) - # Make the core-tests library. include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni support xml) @@ -174,17 +164,6 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_BUILD_HOST_DEX := true include $(BUILD_HOST_JAVA_LIBRARY) - # Make the sqlite JDBC driver. - include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(call all-main-java-files-under,sqlite-jdbc) - LOCAL_NO_STANDARD_LIBRARIES := true - LOCAL_JAVA_LIBRARIES := core-hostdex - LOCAL_JAVACFLAGS := $(local_javac_flags) - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := sqlite-jdbc-hostdex - LOCAL_BUILD_HOST_DEX := true - include $(BUILD_HOST_JAVA_LIBRARY) - # Make the core-tests library. include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni support xml) |