From 9d53832929770fd2011403ac116de50e4f1342f7 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sat, 19 Feb 2022 02:04:18 +0800
Subject: [PATCH] Disable lto and use c++_shared

---
 library/build.gradle.kts   | 5 -----
 library/jni/Android.mk     | 5 ++---
 library/jni/Application.mk | 6 +++---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index fa33063..5ca28f3 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -65,8 +65,3 @@ android {
         }
     }
 }
-
-
-dependencies {
-    implementation("dev.rikka.ndk.thirdparty:cxx:1.2.0")
-}
diff --git a/library/jni/Android.mk b/library/jni/Android.mk
index ce1be17..cb63192 100644
--- a/library/jni/Android.mk
+++ b/library/jni/Android.mk
@@ -6,10 +6,9 @@ LOCAL_MODULE           := lsplant
 LOCAL_C_INCLUDES       := $(LOCAL_PATH)/include
 LOCAL_SRC_FILES        := lsplant.cc
 LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES := cxx dex_builder
-LOCAL_LDLIBS           := -llog
+LOCAL_STATIC_LIBRARIES := dex_builder
+LOCAL_EXPORT_LDLIBS    := -llog
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,prefab/cxx)
 include jni/external/dex_builder/Android.mk
 
diff --git a/library/jni/Application.mk b/library/jni/Application.mk
index 98878a3..1694eaa 100644
--- a/library/jni/Application.mk
+++ b/library/jni/Application.mk
@@ -3,12 +3,12 @@ APP_CFLAGS     += -fno-stack-protector -fomit-frame-pointer
 APP_CFLAGS     += -Wno-builtin-macro-redefined -D__FILE__=__FILE_NAME__ -Wno-gnu-string-literal-operator-template
 APP_CPPFLAGS   := -std=c++20
 APP_CONLYFLAGS := -std=c18
-APP_STL        := none
+APP_STL        := c++_shared
 
 ifneq ($(NDK_DEBUG),1)
-APP_CFLAGS     += -Oz -flto
+APP_CFLAGS     += -Oz
 APP_CFLAGS     += -Wno-unused -Wno-unused-parameter -Werror
 APP_CFLAGS     += -fvisibility=hidden -fvisibility-inlines-hidden
 APP_CFLAGS     += -fno-unwind-tables -fno-asynchronous-unwind-tables
-APP_LDFLAGS    += -Wl,--exclude-libs,ALL -flto -Wl,--gc-sections -Wl,--strip-all
+APP_LDFLAGS    += -Wl,--exclude-libs,ALL -Wl,--gc-sections -Wl,--strip-all
 endif