From a7e2c8493944f61d40bd3414266c1e001dad34ae Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 27 Jun 2019 17:54:59 +0200 Subject: [PATCH] Revert "(Android) Backport https://github.com/libretro/RetroArch/pull/9021/commits/1991e4f6c1c9064e813679c6a5970bb6c13b413e" This reverts commit 630b7c912289988e8405d4d52425de16aca01e78. --- pkg/android/phoenix/jni/Android.mk | 2 +- pkg/android/phoenix64/jni/Android.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index a672e7a9c5..563e86fa96 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -100,7 +100,7 @@ LOCAL_CPPFLAGS := -fexceptions -fpermissive -std=gnu++11 -fno-rtti -Wno-reorder # Let ndk-build set the optimization flags but remove -O3 like in cf3c3 LOCAL_CFLAGS := $(subst -O3,-O2,$(LOCAL_CFLAGS)) -LOCAL_LDLIBS := -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl +LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ \ $(LOCAL_PATH)/$(RARCH_DIR)/deps \ diff --git a/pkg/android/phoenix64/jni/Android.mk b/pkg/android/phoenix64/jni/Android.mk index cf0923453a..0f9477f449 100644 --- a/pkg/android/phoenix64/jni/Android.mk +++ b/pkg/android/phoenix64/jni/Android.mk @@ -99,7 +99,7 @@ LOCAL_CPPFLAGS := -fexceptions -fpermissive -std=gnu++11 -fno-rtti -Wno-reorder # Let ndk-build set the optimization flags but remove -O3 like in cf3c3 LOCAL_CFLAGS := $(subst -O3,-O2,$(LOCAL_CFLAGS)) -LOCAL_LDLIBS := -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl +LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ \ $(LOCAL_PATH)/$(RARCH_DIR)/deps \