From 4737c5117a9e728055a74ee2537b610236bfc37c Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 19 Aug 2022 16:26:25 -0700
Subject: [PATCH] Update to ONDK r25.2

---
 gradle.properties                               |  2 +-
 native/src/Application.mk                       |  2 +-
 native/src/external/Android.mk                  |  4 +++-
 native/src/external/busybox                     |  2 +-
 native/src/external/libcxx                      |  2 +-
 native/src/external/systemproperties/Android.mk |  1 +
 native/src/zygisk/api.hpp                       | 10 +++++++---
 native/src/zygisk/memory.hpp                    |  4 ++++
 8 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index efe0c46db..0613a137f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,4 +29,4 @@ android.nonTransitiveRClass=true
 # Magisk
 magisk.stubVersion=33
 magisk.versionCode=25201
-magisk.ondkVersion=r25.1
+magisk.ondkVersion=r25.2
diff --git a/native/src/Application.mk b/native/src/Application.mk
index 06c2657a9..58a7577e9 100644
--- a/native/src/Application.mk
+++ b/native/src/Application.mk
@@ -10,7 +10,7 @@ APP_STRIP_MODE   := --strip-all
 
 # Busybox should use stock libc.a
 ifdef B_BB
-APP_PLATFORM     := android-24
+APP_PLATFORM     := android-26
 APP_LDFLAGS      += -T src/lto_fix.lds
 ifeq ($(OS),Windows_NT)
 APP_SHORT_COMMANDS := true
diff --git a/native/src/external/Android.mk b/native/src/external/Android.mk
index 652a4ffa4..5c688d6a0 100644
--- a/native/src/external/Android.mk
+++ b/native/src/external/Android.mk
@@ -383,7 +383,9 @@ include $(CLEAR_VARS)
 LOCAL_MODULE:= libz
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/zlib
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
-LOCAL_CFLAGS := -DHAVE_HIDDEN -DZLIB_CONST -Wall -Werror -Wno-unused -Wno-unused-parameter
+LOCAL_CFLAGS := \
+    -DHAVE_HIDDEN -DZLIB_CONST -Wall -Werror \
+    -Wno-unused -Wno-unused-parameter -Wno-deprecated-non-prototype
 LOCAL_SRC_FILES := \
     zlib/adler32.c \
     zlib/compress.c \
diff --git a/native/src/external/busybox b/native/src/external/busybox
index c2479d10d..7236867ef 160000
--- a/native/src/external/busybox
+++ b/native/src/external/busybox
@@ -1 +1 @@
-Subproject commit c2479d10d92d5a30ffa79ee73476b0c4707bf762
+Subproject commit 7236867ef10bb9aeb68a7796a51f3fa269a23e4a
diff --git a/native/src/external/libcxx b/native/src/external/libcxx
index 9b40e8b93..82090ae75 160000
--- a/native/src/external/libcxx
+++ b/native/src/external/libcxx
@@ -1 +1 @@
-Subproject commit 9b40e8b93627e0aef4ee8ad1b9f3aea913ee32c0
+Subproject commit 82090ae75f7d284f2647a67f3f80f28f54eaddfc
diff --git a/native/src/external/systemproperties/Android.mk b/native/src/external/systemproperties/Android.mk
index ccffa2732..ef18ff89b 100644
--- a/native/src/external/systemproperties/Android.mk
+++ b/native/src/external/systemproperties/Android.mk
@@ -5,6 +5,7 @@ LOCAL_MODULE:= libsystemproperties
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES := libcxx
+LOCAL_CFLAGS := -Wno-deprecated-declarations
 LOCAL_SRC_FILES := \
 	context_node.cpp \
 	contexts_serialized.cpp \
diff --git a/native/src/zygisk/api.hpp b/native/src/zygisk/api.hpp
index aee25359e..f1c9f68c2 100644
--- a/native/src/zygisk/api.hpp
+++ b/native/src/zygisk/api.hpp
@@ -325,8 +325,12 @@ inline bool Api::pltHookCommit() {
 
 } // namespace zygisk
 
-[[gnu::visibility("default")]] [[gnu::used]]
-extern "C" void zygisk_module_entry(zygisk::internal::api_table *, JNIEnv *);
+extern "C" {
 
 [[gnu::visibility("default")]] [[gnu::used]]
-extern "C" void zygisk_companion_entry(int);
+void zygisk_module_entry(zygisk::internal::api_table *, JNIEnv *);
+
+[[gnu::visibility("default")]] [[gnu::used]]
+void zygisk_companion_entry(int);
+
+} // extern "C"
diff --git a/native/src/zygisk/memory.hpp b/native/src/zygisk/memory.hpp
index 960fad599..3c2215148 100644
--- a/native/src/zygisk/memory.hpp
+++ b/native/src/zygisk/memory.hpp
@@ -1,7 +1,11 @@
 #pragma once
 
 #include <map>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-builtins"
 #include <parallel_hashmap/phmap.h>
+#pragma clang diagnostic pop
 
 #include <base.hpp>