From 868d829140ff6e2d57e7ceac311b088cc7ba89b1 Mon Sep 17 00:00:00 2001
From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com>
Date: Sat, 10 Feb 2024 01:53:12 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"android=E3=81=AEAAR=E3=83=93=E3=83=AB?=
 =?UTF-8?q?=E3=83=89=E6=99=82=E3=82=82use=5Fcustom=5Flibcxx=3Dfalse?=
 =?UTF-8?q?=E3=81=A8=E3=81=99=E3=82=8B"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 74d5414baebbfd2a66604760b9c7bf0411fa2fe8.
---
 build/android/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/android/Makefile b/build/android/Makefile
index 1f7a264f..1b475d56 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -20,8 +20,7 @@ EXTRA_GN_ARGS := \
 	is_component_build=false \
 	rtc_enable_protobuf=false \
 	rtc_build_json=true \
-	use_rtti=true \
-	use_custom_libcxx=false
+	use_rtti=true
 
 .PHONY: all
 all: clean build package
@@ -66,7 +65,7 @@ patch: common-patch
 
 define build-android
 	cd $(SRC_DIR) && \
-	gn gen $(BUILD_DIR)/static/$1 --args='$(EXTRA_GN_ARGS) $(CC_WRAPPER) target_os="android" target_cpu="$2" $3' && \
+	gn gen $(BUILD_DIR)/static/$1 --args='$(EXTRA_GN_ARGS) use_custom_libcxx=false $(CC_WRAPPER) target_os="android" target_cpu="$2" $3' && \
 	ninja -C $(BUILD_DIR)/static/$1 && \
 	ninja -C $(BUILD_DIR)/static/$1 native_api