ndk构建测试

StArrayJaN · Oct 26, 2023 · d20f3a3 · d20f3a3
1 parent d02ef67
commit d20f3a3
Show file tree

Hide file tree

Showing 47 changed files with 19 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@
 /.gradle
 /local.properties
 /push.sh
-/app/src/main/obj
+/app/src/main/obj
+/app/src/main/jniLibs
+/app/src/main/libs
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 30
     buildToolsVersion '30.0.2'
+    ndkVersion '23.0.7599858'
     namespace "thercn.wmw"
     signingConfigs {
         release {
@@ -30,12 +31,7 @@ android {
             jniDebuggable true
         }
     }
-
-    sourceSets {
-        main {
-            jniLibs.srcDirs = ['libs']
-        }
-    }
+
     lintOptions {
         checkReleaseBuilds false
     }
@@ -44,7 +40,7 @@ repositories {
     maven {     
 	google()
         url "https://jitpack.io"
-	url "https://maven.google.com"
+	    url "https://maven.google.com"
         mavenCentral()
     }    
 } 

diff --git a/app/libs/arm64-v8a/libmui.so b/app/libs/arm64-v8a/libmui.so
diff --git a/app/src/main/jn/Android.mk → app/src/main/jni/Android.mk b/app/src/main/jn/Android.mk → app/src/main/jni/Android.mk
@@ -50,6 +50,14 @@ LOCAL_SRC_FILES:= Source/Imgui/imgui.cpp \
 LOCAL_LDLIBS := -ldl -llog -lEGL -lGLESv3 -landroid
 include $(BUILD_SHARED_LIBRARY)
 
-$(info $(shell cp -r $(LOCAL_PATH)/../../../libs/arm64-v8a $(LOCAL_PATH)/../libs))
-$(info $(shell cp -r $(LOCAL_PATH)/../../../libs/arm64-v8a $(LOCAL_PATH)/../jniLibs))
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE:= wmw
+LOCAL_SRC_FILES:= $(LOCAL_PATH)/libwmw.so
+include $(PREBUILT_SHARED_LIBRARY)
 
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE:= fmodex
+LOCAL_SRC_FILES:= $(LOCAL_PATH)/libfmodex.so
+include $(PREBUILT_SHARED_LIBRARY)
diff --git a/app/src/main/jn/Application.mk → app/src/main/jni/Application.mk b/app/src/main/jn/Application.mk → app/src/main/jni/Application.mk
diff --git a/app/src/main/jni/Binary/fmodex.s b/app/src/main/jni/Binary/fmodex.s
@@ -0,0 +1 @@
+.incbin "libfmodex.so"
diff --git a/app/libs/arm64-v8a/libfmodex.so → app/src/main/jni/Binary/libfmodex.so b/app/libs/arm64-v8a/libfmodex.so → app/src/main/jni/Binary/libfmodex.so
diff --git a/app/libs/arm64-v8a/libwmw.so → app/src/main/jni/Binary/libwmw.so b/app/libs/arm64-v8a/libwmw.so → app/src/main/jni/Binary/libwmw.so
diff --git a/app/src/main/jni/Binary/wmw.s b/app/src/main/jni/Binary/wmw.s
@@ -0,0 +1 @@
+.incbin "libwmw.so"
diff --git a/app/src/main/jn/Include/EGL.h → app/src/main/jni/Include/EGL.h b/app/src/main/jn/Include/EGL.h → app/src/main/jni/Include/EGL.h
diff --git a/app/src/main/jn/Include/Imgui/imconfig.h → app/src/main/jni/Include/Imgui/imconfig.h b/app/src/main/jn/Include/Imgui/imconfig.h → app/src/main/jni/Include/Imgui/imconfig.h
diff --git a/app/src/main/jn/Include/Imgui/imgui.h → app/src/main/jni/Include/Imgui/imgui.h b/app/src/main/jn/Include/Imgui/imgui.h → app/src/main/jni/Include/Imgui/imgui.h
diff --git a/...ain/jn/Include/Imgui/imgui_impl_android.h → ...in/jni/Include/Imgui/imgui_impl_android.h b/...ain/jn/Include/Imgui/imgui_impl_android.h → ...in/jni/Include/Imgui/imgui_impl_android.h
diff --git a/...ain/jn/Include/Imgui/imgui_impl_opengl3.h → ...in/jni/Include/Imgui/imgui_impl_opengl3.h b/...ain/jn/Include/Imgui/imgui_impl_opengl3.h → ...in/jni/Include/Imgui/imgui_impl_opengl3.h
diff --git a/...Include/Imgui/imgui_impl_opengl3_loader.h → ...Include/Imgui/imgui_impl_opengl3_loader.h b/...Include/Imgui/imgui_impl_opengl3_loader.h → ...Include/Imgui/imgui_impl_opengl3_loader.h
diff --git a/...rc/main/jn/Include/Imgui/imgui_internal.h → ...c/main/jni/Include/Imgui/imgui_internal.h b/...rc/main/jn/Include/Imgui/imgui_internal.h → ...c/main/jni/Include/Imgui/imgui_internal.h
diff --git a/...rc/main/jn/Include/Imgui/imstb_rectpack.h → ...c/main/jni/Include/Imgui/imstb_rectpack.h b/...rc/main/jn/Include/Imgui/imstb_rectpack.h → ...c/main/jni/Include/Imgui/imstb_rectpack.h
diff --git a/...rc/main/jn/Include/Imgui/imstb_textedit.h → ...c/main/jni/Include/Imgui/imstb_textedit.h b/...rc/main/jn/Include/Imgui/imstb_textedit.h → ...c/main/jni/Include/Imgui/imstb_textedit.h
diff --git a/...rc/main/jn/Include/Imgui/imstb_truetype.h → ...c/main/jni/Include/Imgui/imstb_truetype.h b/...rc/main/jn/Include/Imgui/imstb_truetype.h → ...c/main/jni/Include/Imgui/imstb_truetype.h
diff --git a/...src/main/jn/Include/Imgui_Android_Input.h → ...rc/main/jni/Include/Imgui_Android_Input.h b/...src/main/jn/Include/Imgui_Android_Input.h → ...rc/main/jni/Include/Imgui_Android_Input.h
diff --git a/app/src/main/jn/Include/MyFile.h → app/src/main/jni/Include/MyFile.h b/app/src/main/jn/Include/MyFile.h → app/src/main/jni/Include/MyFile.h
diff --git a/app/src/main/jn/Include/OPPOSans-H.h → app/src/main/jni/Include/OPPOSans-H.h b/app/src/main/jn/Include/OPPOSans-H.h → app/src/main/jni/Include/OPPOSans-H.h
diff --git a/app/src/main/jn/Include/Utils.h → app/src/main/jni/Include/Utils.h b/app/src/main/jn/Include/Utils.h → app/src/main/jni/Include/Utils.h
diff --git a/app/src/main/jn/Include/log.h → app/src/main/jni/Include/log.h b/app/src/main/jn/Include/log.h → app/src/main/jni/Include/log.h
diff --git a/app/src/main/jn/Include/pch.h → app/src/main/jni/Include/pch.h b/app/src/main/jn/Include/pch.h → app/src/main/jni/Include/pch.h
diff --git a/app/src/main/jn/Include/timer.h → app/src/main/jni/Include/timer.h b/app/src/main/jn/Include/timer.h → app/src/main/jni/Include/timer.h
diff --git a/...n/jn/Platinmods/PlatinmodsMemoryPatch.cpp → .../jni/Platinmods/PlatinmodsMemoryPatch.cpp b/...n/jn/Platinmods/PlatinmodsMemoryPatch.cpp → .../jni/Platinmods/PlatinmodsMemoryPatch.cpp
diff --git a/...ain/jn/Platinmods/PlatinmodsMemoryPatch.h → ...in/jni/Platinmods/PlatinmodsMemoryPatch.h b/...ain/jn/Platinmods/PlatinmodsMemoryPatch.h → ...in/jni/Platinmods/PlatinmodsMemoryPatch.h
diff --git a/...rc/main/jn/Platinmods/PlatinmodsUtils.cpp → ...c/main/jni/Platinmods/PlatinmodsUtils.cpp b/...rc/main/jn/Platinmods/PlatinmodsUtils.cpp → ...c/main/jni/Platinmods/PlatinmodsUtils.cpp
diff --git a/app/src/main/jn/Platinmods/PlatinmodsUtils.h → ...src/main/jni/Platinmods/PlatinmodsUtils.h b/app/src/main/jn/Platinmods/PlatinmodsUtils.h → ...src/main/jni/Platinmods/PlatinmodsUtils.h
diff --git a/app/src/main/jn/Source/EGL.cpp → app/src/main/jni/Source/EGL.cpp b/app/src/main/jn/Source/EGL.cpp → app/src/main/jni/Source/EGL.cpp
diff --git a/app/src/main/jn/Source/EGL.cpp.bak → app/src/main/jni/Source/EGL.cpp.bak b/app/src/main/jn/Source/EGL.cpp.bak → app/src/main/jni/Source/EGL.cpp.bak
diff --git a/app/src/main/jn/Source/Imgui/imgui.cpp → app/src/main/jni/Source/Imgui/imgui.cpp b/app/src/main/jn/Source/Imgui/imgui.cpp → app/src/main/jni/Source/Imgui/imgui.cpp
diff --git a/app/src/main/jn/Source/Imgui/imgui_demo.cpp → app/src/main/jni/Source/Imgui/imgui_demo.cpp b/app/src/main/jn/Source/Imgui/imgui_demo.cpp → app/src/main/jni/Source/Imgui/imgui_demo.cpp
diff --git a/app/src/main/jn/Source/Imgui/imgui_draw.cpp → app/src/main/jni/Source/Imgui/imgui_draw.cpp b/app/src/main/jn/Source/Imgui/imgui_draw.cpp → app/src/main/jni/Source/Imgui/imgui_draw.cpp
diff --git a/...in/jn/Source/Imgui/imgui_impl_android.cpp → ...n/jni/Source/Imgui/imgui_impl_android.cpp b/...in/jn/Source/Imgui/imgui_impl_android.cpp → ...n/jni/Source/Imgui/imgui_impl_android.cpp
diff --git a/...in/jn/Source/Imgui/imgui_impl_opengl3.cpp → ...n/jni/Source/Imgui/imgui_impl_opengl3.cpp b/...in/jn/Source/Imgui/imgui_impl_opengl3.cpp → ...n/jni/Source/Imgui/imgui_impl_opengl3.cpp
diff --git a/...src/main/jn/Source/Imgui/imgui_tables.cpp → ...rc/main/jni/Source/Imgui/imgui_tables.cpp b/...src/main/jn/Source/Imgui/imgui_tables.cpp → ...rc/main/jni/Source/Imgui/imgui_tables.cpp
diff --git a/...rc/main/jn/Source/Imgui/imgui_widgets.cpp → ...c/main/jni/Source/Imgui/imgui_widgets.cpp b/...rc/main/jn/Source/Imgui/imgui_widgets.cpp → ...c/main/jni/Source/Imgui/imgui_widgets.cpp
diff --git a/...rc/main/jn/Source/Imgui_Android_Input.cpp → ...c/main/jni/Source/Imgui_Android_Input.cpp b/...rc/main/jn/Source/Imgui_Android_Input.cpp → ...c/main/jni/Source/Imgui_Android_Input.cpp
diff --git a/app/src/main/jn/Source/MyFile.cpp → app/src/main/jni/Source/MyFile.cpp b/app/src/main/jn/Source/MyFile.cpp → app/src/main/jni/Source/MyFile.cpp
diff --git a/app/src/main/jn/native-lib.cpp → app/src/main/jni/native-lib.cpp b/app/src/main/jn/native-lib.cpp → app/src/main/jni/native-lib.cpp
diff --git a/app/src/main/jniLibs/arm64-v8a/libfmodex.so b/app/src/main/jniLibs/arm64-v8a/libfmodex.so
diff --git a/app/src/main/jniLibs/arm64-v8a/libwmw.so b/app/src/main/jniLibs/arm64-v8a/libwmw.so
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,2 @@
 android.useAndroidX=true
+ndkVersion=23.0.7599858
diff --git a/nativelib/libfmodex.so b/nativelib/libfmodex.so
diff --git a/nativelib/libwmw.so b/nativelib/libwmw.so
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		android.useAndroidX=true
		ndkVersion=23.0.7599858