Skip to content

Commit

Permalink
Revert "androidのAARビルド時もuse_custom_libcxx=falseとする"
Browse files Browse the repository at this point in the history
This reverts commit 74d5414.
  • Loading branch information
crow-misia committed Feb 9, 2024
1 parent 352d7fd commit 868d829
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions build/android/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 868d829

Please sign in to comment.