diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-12-30 17:49:02 -0600 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-12-30 17:49:02 -0600 |
| commit | e93d8a605829765a0d223b6c4e45157ee9ff1d3c (patch) | |
| tree | 9d856b507ce61ac191f27ae999054e2f9ae7d3d0 /ACE | |
| parent | a055a73b1431abe7bc04d3886e2b166757ae2992 (diff) | |
| download | ATCD-e93d8a605829765a0d223b6c4e45157ee9ff1d3c.tar.gz | |
Move -llog from platform_android.GNU to acedefaults
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/acedefaults.mpb | 4 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 3 |
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 |