commit a162a86accfb8213da7a67e86c15fcf6d1df21e1
author Elliott Hughes <enh@google.com> Fri Aug 30 23:21:52 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 30 23:21:53 2013 +0000
tree 42f9caa235a058a36b9b727fb8c11c4fb6a6544b
parent 50d26c10a445f802b857c300b11f118e962145eb
parent 0a7faa227e18f0eadd150c4b24e3dd063177ab43

Merge "Fix the build when logging is enabled."

i18n/Android.mk

diff --git a/i18n/Android.mk b/i18n/Android.mk
index 2297167..a359d8f 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -140,7 +140,8 @@
 LOCAL_SDK_VERSION := 9
 LOCAL_NDK_STL_VARIANT := stlport_static
 LOCAL_SRC_FILES += $(src_files)
-LOCAL_C_INCLUDES += $(c_includes)
+LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes)
+LOCAL_SHARED_LIBRARIES += $(optional_android_logging_libraries)
 LOCAL_STATIC_LIBRARIES += libicuuc_static
 LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)
 LOCAL_CPP_FEATURES := rtti