diff options
| -rw-r--r-- | solenv/gbuild/platform/ANDROID_ARM_GCC.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/unxandr.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk index 695f68d701dc..7fc6a518113a 100644 --- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk @@ -61,7 +61,7 @@ $(call gb_Helper_abbreviate_dirs,\ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ $(LIBS) \ $(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \ - -llog -landroid \ + -llog -landroid -lgnustl_shared \ -o $(1)) endef diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk index 56ed49d155a4..c22dbe910c9f 100644 --- a/solenv/inc/unxandr.mk +++ b/solenv/inc/unxandr.mk @@ -45,6 +45,6 @@ CFLAGS+=-fno-omit-frame-pointer LINKFLAGSAPPGUI=-shared LINKFLAGSAPPCUI=-shared -STDLIBGUIMT+=-llog -landroid -STDLIBCUIMT+=-llog -landroid +STDLIBGUIMT+=-llog -landroid -lgnustl_shared +STDLIBCUIMT+=-llog -landroid -lgnustl_shared |