Revert "compatible build with android-ndk-r18"

cisco · Oct 8, 2023 · 4d303dd · 4d303dd
1 parent 008465e
commit 4d303dd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 143 deletions.
diff --git a/Makefile b/Makefile
@@ -80,11 +80,7 @@ endif
 # Make sure the all target is the first one
 all: libraries binaries
 
-ifeq ($(findstring android-ndk-r18, $(NDKROOT)), android-ndk-r18)
-    include $(SRC_PATH)build/platform-android-r18b.mk
-else
-    include $(SRC_PATH)build/platform-$(OS).mk
-endif
+include $(SRC_PATH)build/platform-$(OS).mk
 
 MODULE := $(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIX)
 

diff --git a/build/platform-android-r18b.mk b/build/platform-android-r18b.mk