还原脚本

Author: neilyhe

.github/script/build_android_combine.sh

@@ -1,9 +1,5 @@
 #!/bin/sh
 
-# 安装必要的构建工具
-sudo apt-get update
-sudo apt-get install -y ninja-build cmake
-
 rb=$(git rev-parse --abbrev-ref HEAD)
 echo $rb
 echo $GIT_BRANCH_IMAGE_VERSION
@@ -43,26 +39,14 @@ mv ../.github/file/libs/armeabi-v7a/libcurl.a  iot/device/android_device/lib/arm
 # 3.编译iot_video_demo.so
 mkdir -p build/android_arm64
 cd build/android_arm64
-cmake ../.. \
-  -DCMAKE_TOOLCHAIN_FILE=/usr/local/lib/android/sdk/ndk/25.1.8937393/build/cmake/android.toolchain.cmake \
-  -DANDROID_NDK=/usr/local/lib/android/sdk/ndk/25.1.8937393 \
-  -DANDROID_ABI=arm64-v8a \
-  -DANDROID_PLATFORM=android-21 \
-  -DANDROID_STL=c++_shared \
-  -G Ninja
-ninja -j8
+cmake ../.. -DCMAKE_TOOLCHAIN_FILE=/usr/local/lib/android/sdk/ndk/16.1.4479499/build/cmake/android.toolchain.cmake  -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9  -DANDROID_NDK=/usr/local/lib/android/sdk/ndk/16.1.4479499  -DCMAKE_BUILD_TYPE=Release  -DANDROID_NATIVE_API_LEVEL=android-9  -DANDROID_ABI=arm64-v8a -DANDROID_TOOLCHAIN=clang
+make all -j8
 
 cd ../../
 mkdir -p build/android_armv7
 cd build/android_armv7
-cmake ../.. \
-  -DCMAKE_TOOLCHAIN_FILE=/usr/local/lib/android/sdk/ndk/25.1.8937393/build/cmake/android.toolchain.cmake \
-  -DANDROID_NDK=/usr/local/lib/android/sdk/ndk/25.1.8937393 \
-  -DANDROID_ABI=armeabi-v7a \
-  -DANDROID_PLATFORM=android-21 \
-  -DANDROID_STL=c++_shared \
-  -G Ninja
-ninja -j8
+cmake ../.. -DCMAKE_TOOLCHAIN_FILE=/usr/local/lib/android/sdk/ndk/16.1.4479499/build/cmake/android.toolchain.cmake  -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9  -DANDROID_NDK=/usr/local/lib/android/sdk/ndk/16.1.4479499  -DCMAKE_BUILD_TYPE=Release  -DANDROID_NATIVE_API_LEVEL=android-9  -DANDROID_ABI=armeabi-v7a -DANDROID_TOOLCHAIN=clang
+make all -j8
 
 cd ../../
 mv build/android_arm64/libenet.a                         iot/device/android_device/lib/arm64-v8a
@@ -84,9 +68,12 @@ ls -l output/arm64-v8a/
 ls -l output/armeabi-v7a/
 
 #编译app xp2p sdk
-mv output/armeabi-v7a/libiot_video_demo.so   device_video_aar/explorer-app-video-sdk/libs/armeabi-v7a
-mv output/arm64-v8a/libiot_video_demo.so   device_video_aar/explorer-app-video-sdk/libs/arm64-v8a
+mv output/armeabi-v7a/libiot_video_demo.so   device_video_aar/explorer-device-video-sdk/libs/armeabi-v7a
+mv output/arm64-v8a/libiot_video_demo.so   device_video_aar/explorer-device-video-sdk/libs/arm64-v8a
 
 # 4.构建打包aar所需要的app头文件以及native-lib.cpp文件
-mv samples/iot_video_demo/app_interface/appWrapper.h   device_video_aar/explorer-app-video-sdk/src/main/cpp
-mv samples/iot_video_demo/app_interface/app_log.h      device_video_aar/explorer-app-video-sdk/src/main/cpp
+mv ../../link/android_app/java/*.java           device_video_aar/explorer-device-video-sdk/src/main/java/com/tencent/xnet
+mv ../../link/android_app/cpp/native-lib.cpp    device_video_aar/explorer-device-video-sdk/src/main/cpp/app-native-lib.cpp
+sed -i '/\/\/xxxxxxJNI_OnLoad & JNI_OnUnload xxxxxx/, +30d' device_video_aar/explorer-device-video-sdk/src/main/cpp/app-native-lib.cpp
+mv samples/iot_video_demo/app_interface/appWrapper.h   device_video_aar/explorer-device-video-sdk/src/main/cpp
+mv samples/iot_video_demo/app_interface/app_log.h      device_video_aar/explorer-device-video-sdk/src/main/cpp