Fix CI building

hrydgard · Dec 14, 2023 · a201d50 · a201d50
1 parent a461800
commit a201d50
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
@@ -140,6 +140,17 @@ RCHEEVOS_FILES := \
   ${SRC}/ext/rcheevos/src/rhash/hash.c \
   ${SRC}/ext/rcheevos/src/rhash/md5.c
 
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+	ADRENOTOOLS_FILES := \
+	  ${SRC}/ext/libadrenotools/src/driver.cpp \
+	  ${SRC}/ext/libadrenotools/src/hook/hook_impl.cpp \
+	  ${SRC}/ext/libadrenotools/src/hook/file_redirect_hook.c \
+	  ${SRC}/ext/libadrenotools/src/hook/gsl_alloc_hook.c \
+	  ${SRC}/ext/libadrenotools/src/hook/main_hook.c \
+	  ${SRC}/ext/libadrenotools/lib/linkernsbypass/android_linker_ns.cpp \
+	  ${SRC}/ext/libadrenotools/lib/linkernsbypass/elf_soname_patcher.cpp
+endif
+
 VR_FILES := \
   $(SRC)/Common/VR/OpenXRLoader.cpp \
   $(SRC)/Common/VR/PPSSPPVR.cpp \
@@ -317,6 +328,10 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Common/SysError.cpp \
   $(SRC)/Common/TimeUtil.cpp
 
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+    EXEC_AND_LIB_FILES += $(ADRENOTOOLS_FILES)
+endif
+
 LOCAL_MODULE := ppsspp_common
 LOCAL_SRC_FILES := $(EXEC_AND_LIB_FILES)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
@@ -22,7 +22,6 @@ LOCAL_C_INCLUDES := \
   $(LOCAL_PATH)/../../ext/armips/ext/tinyformat \
   $(LOCAL_PATH)/../../ext/libchdr/deps/lzma-22.01/include \
   $(LOCAL_PATH)/../../ext/libchdr/include \
-  $(LOCAL_PATH)/../../ext/libadrenotools/include \
   $(LOCAL_PATH)
 
 LOCAL_STATIC_LIBRARIES := libzip glslang-build miniupnp-build
@@ -75,4 +74,6 @@ ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/arm64/lib/libswscale.a
   LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/arm64/lib/libavutil.a
   LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/arm64/include
+  LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ext/libadrenotools/include
+  LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ext/libadrenotools/lib/linkernsbypass
 endif