Skip to content

Commit 5de393b

Browse files
author
eagleychen
committed
Merge branch 'v2.4.x' of https://github.com/tencentyun/iot-p2p-build into v2.4.x
2 parents 804857c + c1e6732 commit 5de393b

11 files changed

+330
-44
lines changed

‎.github/file/secret.gpg.asc‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
-----BEGIN PGP MESSAGE-----
2+
3+
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
107+
IyU8ToZuowMP6Jl8JCOb
108+
=YmSB
109+
-----END PGP MESSAGE-----

‎.github/script/build_android_combine.sh‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ mv iot/link/app_common/curl_inc/* iot/device/android_device/samples/i
2828
mv iot/link/app_common/app_p2p/* iot/device/android_device/samples/iot_video_demo/app_interface
2929
mv iot/link/app_common/cloud_api/* iot/device/android_device/samples/iot_video_demo/app_interface
3030
mv iot/link/app_common/utils/* iot/device/android_device/samples/iot_video_demo/app_interface
31-
rm iot/device/android_device/samples/iot_video_demo/app_interface/utils_hmac.cpp
31+
#rm iot/device/android_device/samples/iot_video_demo/app_interface/utils_hmac.cpp
3232

3333
# 2.1 更新p2p代码版本
3434
sed -i "s#.*VIDEOSDKVERSION.*#static const char * VIDEOSDKVERSION = \"$rc\";#g" iot/device/android_device/samples/iot_video_demo/app_interface/appWrapper.h
@@ -39,14 +39,26 @@ mv ../.github/file/libs/armeabi-v7a/libcurl.a iot/device/android_device/lib/arm
3939
# 3.编译iot_video_demo.so
4040
mkdir -p build/android_arm64
4141
cd build/android_arm64
42-
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
43-
make all -j8
42+
cmake ../.. \
43+
-DCMAKE_TOOLCHAIN_FILE=/usr/local/lib/android/sdk/ndk/18.1.5063045/build/cmake/android.toolchain.cmake \
44+
-DANDROID_NDK=/usr/local/lib/android/sdk/ndk/18.1.5063045 \
45+
-DCMAKE_BUILD_TYPE=Release \
46+
-DANDROID_NATIVE_API_LEVEL=21 \
47+
-DANDROID_ABI=arm64-v8a \
48+
-DANDROID_STL=c++_static
49+
make -j8
4450

4551
cd ../../
4652
mkdir -p build/android_armv7
4753
cd build/android_armv7
48-
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
49-
make all -j8
54+
cmake ../.. \
55+
-DCMAKE_TOOLCHAIN_FILE=/usr/local/lib/android/sdk/ndk/18.1.5063045/build/cmake/android.toolchain.cmake \
56+
-DANDROID_NDK=/usr/local/lib/android/sdk/ndk/18.1.5063045 \
57+
-DCMAKE_BUILD_TYPE=Release \
58+
-DANDROID_NATIVE_API_LEVEL=21 \
59+
-DANDROID_ABI=armeabi-v7a \
60+
-DANDROID_STL=c++_static
61+
make -j8
5062

5163
cd ../../
5264
mv build/android_arm64/libenet.a iot/device/android_device/lib/arm64-v8a
@@ -67,12 +79,13 @@ cd iot/device/android_device
6779
ls -l output/arm64-v8a/
6880
ls -l output/armeabi-v7a/
6981

70-
mv output/armeabi-v7a/libiot_video_demo.so device_video_aar/explorer-device-video-sdk/libs/armeabi-v7a
71-
mv output/arm64-v8a/libiot_video_demo.so device_video_aar/explorer-device-video-sdk/libs/arm64-v8a
82+
#编译app xp2p sdk
83+
mv output/armeabi-v7a/libiot_video_demo.so device_video_aar/explorer-app-video-sdk/libs/armeabi-v7a
84+
mv output/arm64-v8a/libiot_video_demo.so device_video_aar/explorer-app-video-sdk/libs/arm64-v8a
7285

7386
# 4.构建打包aar所需要的app头文件以及native-lib.cpp文件
74-
mv ../../link/android_app/java/*.java device_video_aar/explorer-device-video-sdk/src/main/java/com/tencent/xnet
75-
mv ../../link/android_app/cpp/native-lib.cpp device_video_aar/explorer-device-video-sdk/src/main/cpp/app-native-lib.cpp
76-
sed -i '/\/\/xxxxxxJNI_OnLoad & JNI_OnUnload xxxxxx/, +30d' device_video_aar/explorer-device-video-sdk/src/main/cpp/app-native-lib.cpp
77-
mv samples/iot_video_demo/app_interface/appWrapper.h device_video_aar/explorer-device-video-sdk/src/main/cpp
78-
mv samples/iot_video_demo/app_interface/app_log.h device_video_aar/explorer-device-video-sdk/src/main/cpp
87+
#mv ../../link/android_app/java/*.java device_video_aar/explorer-device-video-sdk/src/main/java/com/tencent/xnet
88+
#mv ../../link/android_app/cpp/native-lib.cpp device_video_aar/explorer-device-video-sdk/src/main/cpp/app-native-lib.cpp
89+
#sed -i '/\/\/xxxxxxJNI_OnLoad & JNI_OnUnload xxxxxx/, +30d' device_video_aar/explorer-device-video-sdk/src/main/cpp/app-native-lib.cpp
90+
#mv samples/iot_video_demo/app_interface/appWrapper.h device_video_aar/explorer-device-video-sdk/src/main/cpp
91+
#mv samples/iot_video_demo/app_interface/app_log.h device_video_aar/explorer-device-video-sdk/src/main/cpp

‎.github/script/build_enet_android_device.sh‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/sh
22
#set -eo pipefail
3+
# 安装必要的构建工具
4+
sudo apt-get update
5+
sudo apt-get install -y ninja-build cmake
36

47
set -e
58
cmake --version
@@ -34,21 +37,33 @@ cmake --version
3437
#wget https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip
3538
#unzip android-ndk-r16b-linux-x86_64.zip
3639

37-
echo "/usr/local/lib/android/sdk/ndk/16.1.4479499"
38-
ls -l /usr/local/lib/android/sdk/ndk/16.1.4479499/build/cmake
40+
echo "/usr/local/lib/android/sdk/ndk/25.1.8937393"
41+
ls -l /usr/local/lib/android/sdk/ndk/25.1.8937393/build/cmake
3942

4043
pwd ${ANDROID_HOME}
4144

4245
mkdir -p build/android_arm64
4346
cd build/android_arm64
44-
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
45-
make all -j8
47+
cmake ../.. \
48+
-DCMAKE_TOOLCHAIN_FILE=/usr/local/lib/android/sdk/ndk/25.1.8937393/build/cmake/android.toolchain.cmake \
49+
-DANDROID_NDK=/usr/local/lib/android/sdk/ndk/25.1.8937393 \
50+
-DANDROID_ABI=arm64-v8a \
51+
-DANDROID_PLATFORM=android-21 \
52+
-DANDROID_STL=c++_shared \
53+
-G Ninja
54+
ninja -j8
4655

4756
cd ../../
4857
mkdir -p build/android_armv7
4958
cd build/android_armv7
50-
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
51-
make all -j8
59+
cmake ../.. \
60+
-DCMAKE_TOOLCHAIN_FILE=/usr/local/lib/android/sdk/ndk/25.1.8937393/build/cmake/android.toolchain.cmake \
61+
-DANDROID_NDK=/usr/local/lib/android/sdk/ndk/25.1.8937393 \
62+
-DANDROID_ABI=armeabi-v7a \
63+
-DANDROID_PLATFORM=android-21 \
64+
-DANDROID_STL=c++_shared \
65+
-G Ninja
66+
ninja -j8
5267

5368
cd ../../
5469
mv build/android_arm64/libenet.a android_device/lib/arm64-v8a

‎.github/script/update_values_for_sign.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ password=$PASSWORD_OF_SIGN
55
root_path=$(pwd)
66
sed -i 's#MY_KEY_ID#'$key_id'#g' $1
77
sed -i 's#MY_PASSWORD#'$password'#g' $1
8-
sed -i 's#MY_KEY_RING_FILE#'$root_path'/secring.gpg#g' $1
8+
sed -i 's#MY_KEY_RING_FILE#'$root_path'/secret.gpg#g' $1
9+
10+
sed -i 's#MY_MAVEN_USERNAME#'$IOT_SONATYPE_USERNAME'#g' $1
11+
sed -i 's#MY_MAVEN_PASSWORD#'$IOT_SONATYPE_PASSWORD'#g' $1

‎.github/workflows/libxp2p_android.yml.bck‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
sh .github/script/update_values_for_sign.sh iot-p2p/samples/android/gradle.properties
5454
- name: Build with Gradle
5555
run: |
56-
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/file/secring.gpg.asc > secring.gpg
56+
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/file/secret.gpg.asc > secret.gpg
5757
echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;22.0.7026061"
5858
cmake_version=$(echo $(cmake --version) | perl -pe '($_)=/([0-9]+([.][0-9]+)+)/')
5959
echo +++++$cmake_version
@@ -89,7 +89,7 @@ jobs:
8989
cp -r iot-p2p/samples/android/xnet/build/intermediates/cmake/release/obj/ xp2p_artifacts/
9090
zip -r xp2p_artifacts.zip xp2p_artifacts
9191
- name: Upload aar to Artifacts
92-
uses: actions/upload-artifact@v2
92+
uses: actions/upload-artifact@v4
9393
with:
9494
name: xp2p
9595
path: |
@@ -115,4 +115,4 @@ jobs:
115115
- name: Publish aar to Maven
116116
run: |
117117
cd iot-p2p/samples/android
118-
./gradlew publish
118+
./gradlew publishToMavenCentral

‎.github/workflows/libxp2p_android_combine.yml‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,31 @@ env:
1515

1616
jobs:
1717
build-and-deploy:
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-22.04
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v2
2222
with:
2323
fetch-depth: 0
24-
24+
- name: Set up JDK 17
25+
uses: actions/setup-java@v3
26+
with:
27+
distribution: 'temurin'
28+
java-version: '17'
29+
30+
- name: Verify Java version
31+
run: java -version
2532
- name: Setup cmake
2633
uses: jwlawson/actions-setup-cmake@v1.8
2734
with:
2835
cmake-version: '3.17.0'
2936
- name: Use cmake
3037
run: echo +++++$(cmake --version)
31-
38+
3239
- name: Setup NDK
33-
run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;16.1.4479499"
34-
35-
40+
run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;18.1.5063045"
41+
42+
3643
- name: build libenet debug
3744
if: startsWith(github.event.ref, 'refs/heads')
3845
run: |
@@ -51,14 +58,14 @@ jobs:
5158
env:
5259
GIT_ACCESS_TOKEN: ${{ secrets.IOT_GITHUB_ACCESS_TOKEN }}
5360
PROVISIONING_PASSWORD: ${{ secrets.GPG_DECRYPT_PASSPHRASE }}
54-
61+
5562
- name: Compress xp2p artifacts
5663
run: |
5764
mkdir xp2p_artifacts
58-
cp -r iot-p2p/iot/device/android_device/device_video_aar/explorer-device-video-sdk/libs/ xp2p_artifacts/
65+
cp -r iot-p2p/iot/device/android_device/device_video_aar/explorer-app-video-sdk/libs/ xp2p_artifacts/
5966
zip -r xp2p_artifacts.zip xp2p_artifacts
6067
- name: Upload .so to Artifacts
61-
uses: actions/upload-artifact@v2
68+
uses: actions/upload-artifact@v4
6269
with:
6370
name: xp2p
6471
path: |
@@ -76,7 +83,7 @@ jobs:
7683
run: |
7784
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
7885
export GIT_BRANCH_IMAGE_VERSION=$VERSION
79-
bash .github/script/update_version_for_android.sh Release iot-p2p/iot/device/android_device/device_video_aar/explorer-device-video-sdk/build.gradle
86+
bash .github/script/update_version_for_android.sh Release iot-p2p/iot/device/android_device/device_video_aar/explorer-app-video-sdk/build.gradle
8087
8188
- name: Update Values of Signing
8289
run: |
@@ -86,7 +93,7 @@ jobs:
8693
8794
- name: Build with Gradle
8895
run: |
89-
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/file/secring.gpg.asc > secring.gpg
96+
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/file/secret.gpg.asc > secret.gpg
9097
chmod -R 777 iot-p2p/iot/device/android_device/device_video_aar/
9198
cd iot-p2p/iot/device/android_device/device_video_aar/
9299
./gradlew build
@@ -95,4 +102,5 @@ jobs:
95102
run: |
96103
chmod -R 777 iot-p2p/iot/device/android_device/device_video_aar/
97104
cd iot-p2p/iot/device/android_device/device_video_aar/
98-
./gradlew publish
105+
./gradlew publishToMavenCentral
106+

‎.github/workflows/libxp2p_android_device.yml.bck‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,20 @@ env:
1515

1616
jobs:
1717
build-and-deploy:
18-
runs-on: ubuntu-18.04
18+
runs-on: ubuntu-22.04
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v2
2222
with:
2323
fetch-depth: 0
24-
24+
- name: Set up JDK 17
25+
uses: actions/setup-java@v3
26+
with:
27+
distribution: 'temurin'
28+
java-version: '17'
29+
30+
- name: Verify Java version
31+
run: java -version
2532
- name: Setup cmake
2633
uses: jwlawson/actions-setup-cmake@v1.8
2734
with:
@@ -30,7 +37,7 @@ jobs:
3037
run: echo +++++$(cmake --version)
3138

3239
- name: Setup NDK
33-
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;16.1.4479499"
40+
run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;25.1.8937393"
3441

3542

3643
- name: build libenet debug
@@ -74,7 +81,7 @@ jobs:
7481

7582
- name: Build with Gradle
7683
run: |
77-
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/file/secring.gpg.asc > secring.gpg
84+
gpg -d --passphrase "$GPG_DECRYPT_PASSPHRASE" --batch --quiet .github/file/secret.gpg.asc > secret.gpg
7885
chmod -R 777 iot-p2p/android_device/device_video_aar/
7986
cd iot-p2p/android_device/device_video_aar/
8087
./gradlew build
@@ -83,4 +90,4 @@ jobs:
8390
run: |
8491
chmod -R 777 iot-p2p/android_device/device_video_aar/
8592
cd iot-p2p/android_device/device_video_aar/
86-
./gradlew publish
93+
./gradlew publishMavenPublicationToMavenCentralRepository

‎.github/workflows/libxp2p_ios.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build-and-deploy:
11-
runs-on: macos-12
11+
runs-on: macos-14
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v3
@@ -36,7 +36,7 @@ jobs:
3636
PROVISIONING_PASSWORD: ${{ secrets.GPG_DECRYPT_PASSPHRASE }}
3737

3838
- name: Upload NETSDK Library
39-
uses: actions/upload-artifact@v2
39+
uses: actions/upload-artifact@v4
4040
with:
4141
name: libenet_ios.a
4242
path: iot-p2p/build/ios/Release-iphoneos/libenet.a

0 commit comments

Comments
 (0)