Libcore: Add debug version of libopenjdk
The debug version, libopenjdkd, depends on the debug version for
the jvm connector, libopenjdkjvmd.
Bug: 26422233
Change-Id: I78a948bccd4a06e738194537233fa0cfca050087
diff --git a/NativeCode.mk b/NativeCode.mk
index 67d127a..0ef43a7 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -138,6 +138,28 @@
LOCAL_CXX_STL := libc++
include $(BUILD_SHARED_LIBRARY)
+# Debug version of libopenjdk. Depends on libopenjdkjvmd.
+include $(CLEAR_VARS)
+
+LOCAL_CFLAGS += $(libart_cflags)
+LOCAL_CPPFLAGS += $(core_cppflags)
+ifeq ($(TARGET_ARCH),arm)
+# Ignore "note: the mangling of 'va_list' has changed in GCC 4.4"
+LOCAL_CFLAGS += -Wno-psabi
+endif
+
+LOCAL_CFLAGS += $(openjdk_cflags)
+LOCAL_SRC_FILES := $(openjdk_core_src_files)
+LOCAL_C_INCLUDES := $(core_c_includes)
+LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libcrypto libicuuc libssl libz
+LOCAL_SHARED_LIBRARIES += libopenjdkjvmd libnativehelper libdl
+LOCAL_STATIC_LIBRARIES := $(core_static_libraries) libfdlibm
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE := libopenjdkd
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/ojluni/NOTICE
+LOCAL_CXX_STL := libc++
+include $(BUILD_SHARED_LIBRARY)
+
# Test JNI library.
ifeq ($(LIBCORE_SKIP_TESTS),)
@@ -214,6 +236,22 @@
LOCAL_CXX_STL := libc++
include $(BUILD_HOST_SHARED_LIBRARY)
+# Debug version of libopenjdk (host). Depends on libopenjdkjvmd.
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(openjdk_core_src_files)
+LOCAL_C_INCLUDES := $(core_c_includes)
+LOCAL_CFLAGS := -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DLINUX -D__GLIBC__ # Sigh.
+LOCAL_CFLAGS += $(openjdk_cflags)
+LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libicuuc-host libcrypto-host libz-host
+LOCAL_SHARED_LIBRARIES += libopenjdkjvmd libnativehelper
+LOCAL_STATIC_LIBRARIES := $(core_static_libraries) libfdlibm
+LOCAL_MODULE_TAGS := optional
+LOCAL_LDLIBS += -ldl -lpthread
+LOCAL_MODULE := libopenjdkd
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/ojluni/NOTICE
+LOCAL_MULTILIB := both
+include $(BUILD_HOST_SHARED_LIBRARY)
+
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(openjdk_core_src_files)
LOCAL_C_INCLUDES := $(core_c_includes)