From 74d5414baebbfd2a66604760b9c7bf0411fa2fe8 Mon Sep 17 00:00:00 2001
From: Zenichi Amano <2736571+crow-misia@users.noreply.github.com>
Date: Tue, 14 Nov 2023 16:47:31 +0900
Subject: [PATCH] =?UTF-8?q?android=E3=81=AEAAR=E3=83=93=E3=83=AB=E3=83=89?=
 =?UTF-8?q?=E6=99=82=E3=82=82use=5Fcustom=5Flibcxx=3Dfalse=E3=81=A8?=
 =?UTF-8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Zenichi Amano <2736571+crow-misia@users.noreply.github.com>
---
 build/android/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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