Move logging.h into base/logging.h.
Change-Id: Id68f85f7c3a71b156cb40dec63f94d4fb827f279
diff --git a/build/Android.common.mk b/build/Android.common.mk
index e008779..03d403f 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -130,6 +130,7 @@
LIBART_COMMON_SRC_FILES := \
src/atomic.cc.arm \
+ src/base/logging.cc \
src/base/mutex.cc \
src/base/unix_file/fd_file.cc \
src/base/unix_file/mapped_file.cc \
@@ -178,7 +179,6 @@
src/jni_internal.cc \
src/jobject_comparator.cc \
src/locks.cc \
- src/logging.cc \
src/mem_map.cc \
src/memory_region.cc \
src/monitor.cc \
@@ -270,8 +270,8 @@
LIBART_TARGET_SRC_FILES := \
$(LIBART_COMMON_SRC_FILES) \
+ src/base/logging_android.cc \
src/jdwp/jdwp_adb.cc \
- src/logging_android.cc \
src/monitor_android.cc \
src/runtime_android.cc \
src/thread_android.cc
@@ -315,7 +315,7 @@
LIBART_HOST_SRC_FILES := \
$(LIBART_COMMON_SRC_FILES) \
- src/logging_linux.cc \
+ src/base/logging_linux.cc \
src/monitor_linux.cc \
src/runtime_linux.cc \
src/thread_linux.cc