summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/bin/MakeProjectCreator/config/acedefaults.mpb4
-rw-r--r--ACE/include/makeinclude/platform_android.GNU3
2 files changed, 4 insertions, 3 deletions
diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
index ab81e499e20..1da54d702f4 100644
--- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -24,6 +24,10 @@ project: ipv6, vc_warnings, build_files, test_files, svc_conf_files, ace_unicode
release::macros += ACE_NDEBUG ACE_USE_RCSID=0
}
+ // Link To Android Logging Library for Log_Msg_Android_Logcat
+ specific(gnuace) {
+ linkflags += $(if $(android_abi),-llog)
+ }
}
feature(ace_inline) {
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU
index 6f012cd98ec..0ca79c47a28 100644
--- a/ACE/include/makeinclude/platform_android.GNU
+++ b/ACE/include/makeinclude/platform_android.GNU
@@ -145,9 +145,6 @@ ifeq ($(ssl),1)
PLATFORM_SSL_LDFLAGS += --exclude-libs libcrypto.a,libssl.a
endif
-# Link To Android Logging Library for Log_Msg_Android_Logcat
-LIBS += -llog
-
# link step to avoid 'command line too long' error on Windows
ifeq ($(OS), Windows_NT)
SHOBJS_FILE = $(VSHDIR)$(MAKEFILE)_object_list.tmp