diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2014-04-04 11:23:00 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2014-04-04 11:23:00 +0000 |
| commit | 919af4e104b28365e280bbbbd8e0b89f9a8650bf (patch) | |
| tree | 20647bc0b4cdb9c868bee84410636a9be25a55b7 | |
| parent | b79300b7019eb86436253339e3577bc260ae8cc7 (diff) | |
| download | ATCD-919af4e104b28365e280bbbbd8e0b89f9a8650bf.tar.gz | |
ChangeLogTag: Fri Apr 4 11:17:44 UTC 2014 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6bff07cdf46..fe909272ec8 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 4 11:17:44 UTC 2014 Martin Corino <mcorino@remedy.nl> + + * include/makeinclude/platform_android.GNU: + Make linking the shared STL library dependent on static_libs_only. + Fri Apr 4 08:38:05 UTC 2014 Martin Corino <mcorino@remedy.nl> * bin/PerlACE/ProcessAndroid.pm: @@ -5,10 +10,10 @@ Fri Apr 4 08:38:05 UTC 2014 Martin Corino <mcorino@remedy.nl> * bin/PerlACE/TestTarget_Android.pm: Refactoring to improve functionality and stability of running tests on Android Virtual Device (AVD). - + * bin/PerlACE/Process_Unix.pm: Small correction in remote PID retrieval. - + Thu Mar 27 09:34:54 UTC 2014 Martin Corino <mcorino@remedy.nl> diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index f121a63311b..c851a736987 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -89,8 +89,12 @@ DLD = $(CXX) LD = $(CXX) # make sure to add the required libs for RTTI and exceptions (libsupc++) # and a shared STL lib (libgnustl_shared by default) -ANDROID_STL_DLL?=gnustl_shared -LIBS += -ldl -lsupc++ -l$(ANDROID_STL_DLL) +static_libs_only ?= +ANDROID_STL_DLL ?= gnustl_shared +LIBS += -ldl -lsupc++ +ifneq ($(static_libs_only),1) + LIBS += -l$(ANDROID_STL_DLL) +endif ifeq ($(optimize),1) SOFLAGS += -Wl,-O3 |