Skip to content

Commit 2d2973b

Browse files
RedwidRedwid
committed
Add method to crete aar files
1 parent 4e872f3 commit 2d2973b

File tree

1 file changed

+67
-27
lines changed

1 file changed

+67
-27
lines changed

‎clean-build-copy.sh‎

Lines changed: 67 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export PYTHONUNBUFFERED=1
2323
export VERSIONER_PYTHON_VERSION=2.7
2424
export PYTHONPATH=$PWD
2525
export ANDROIDAPI="23"
26-
export NDKAPI="16"
26+
export NDKAPI="23"
2727

2828
if [ -z "$ANDROID_NDK_HOME" ]
2929
then
@@ -51,55 +51,95 @@ echo "distFolder: ${distFolder}"
5151
#Link for android-youtube-dl project to where script will copy build artifacts
5252
androidYoutubeDlProject="$(dirname "$PWD")/android-youtube-dl"
5353

54+
5455
clean() {
55-
echo "[INFO] Clean"
56-
/usr/bin/python $p4a clean_builds
57-
rm -rfv $distFolder
58-
rm -rfv $PWD/build
59-
echo "[INFO] Clean done"
56+
echo "[INFO] Clean"
57+
/usr/bin/python $p4a clean_builds
58+
rm -rfv $distFolder
59+
rm -rfv $PWD/build
60+
echo "[INFO] Clean done"
6061
}
6162

63+
6264
build() {
63-
echo "[INFO] Build [$1]"
64-
/usr/bin/python $p4a clean_builds
65-
rm -rfv $distFolder
66-
/usr/bin/python $p4a apk --private $pythonApp --dist_name=$pythonAppDistName --package=$pythonAppPackageName --name=$pythonAppName --version=1 --ndk_dir $ANDROID_NDK_HOME --ndk_version r16b --requirements=android,pyopenssl,pycrypto,openssl --android_api=23 --arch=$1 --java-build-tool gradle
67-
copy_libs
68-
copy_assets
69-
echo "[INFO] Build [$1] done"
65+
echo "[INFO] Build [$1]"
66+
python $p4a clean_builds
67+
rm -rfv $distFolder
68+
python $p4a apk --private $pythonApp --dist_name=$pythonAppDistName --package=$pythonAppPackageName --name=$pythonAppName --version=1 --ndk_dir $ANDROID_NDK_HOME --ndk_version r16b --requirements=android,pyopenssl,pycrypto,openssl --android_api=23 --arch=$1 --java-build-tool gradle
69+
# if [ -z "$TRAVIS" ]
70+
# then
71+
# copy_libs
72+
# copy_assets
73+
# else
74+
copy_assets_and_make_aar $1
75+
# fi
76+
echo "[INFO] Build [$1] done"
7077
}
7178

79+
7280
copy_libs() {
73-
mkdir $PWD/build
74-
cp -rfv $distFolder/libs/ $PWD/build/libs/
81+
mkdir $PWD/build
82+
cp -rfv $distFolder/libs/ $PWD/build/libs/
7583
}
7684

85+
7786
copy_assets() {
78-
cp -rfv $distFolder/src/main/assets/ $PWD/build/assets
79-
rm $PWD/build/assets/.gitkeep
87+
cp -rfv $distFolder/src/main/assets/ $PWD/build/assets
88+
rm $PWD/build/assets/.gitkeep
8089

81-
delete_unused_assets "armeabi-v7a"
82-
#delete_unused_assets "x86"
83-
delete_unused_assets "arm64-v8a"
90+
delete_unused_assets "armeabi-v7a"
91+
#delete_unused_assets "x86"
92+
delete_unused_assets "arm64-v8a"
8493
}
8594

95+
8696
delete_unused_assets() {
87-
rm $PWD/build/libs/$1/libSDL2.so
88-
rm $PWD/build/libs/$1/libSDL2_image.so
89-
rm $PWD/build/libs/$1/libSDL2_mixer.so
90-
rm $PWD/build/libs/$1/libSDL2_ttf.so
97+
rm $PWD/build/libs/$1/libSDL2.so
98+
rm $PWD/build/libs/$1/libSDL2_image.so
99+
rm $PWD/build/libs/$1/libSDL2_mixer.so
100+
rm $PWD/build/libs/$1/libSDL2_ttf.so
91101
}
92102

103+
93104
copy_assets_to_androidYoutubeDlProject() {
94-
cp -rfv $PWD/build/assets/ $androidYoutubeDlProject/lib/src/main/assets
95-
cp -rfv $PWD/build/libs/ $androidYoutubeDlProject/lib/src/main/jniLibs
105+
cp -rfv $PWD/build/assets/ $androidYoutubeDlProject/lib/src/main/assets
106+
cp -rfv $PWD/build/libs/ $androidYoutubeDlProject/lib/src/main/jniLibs
96107
}
97108

109+
110+
copy_assets_and_make_aar() {
111+
echo "[INFO] Copy assets [$1]"
112+
#Copy *.so files
113+
mkdir $PWD/build
114+
mkdir $PWD/build/$1
115+
mkdir $PWD/build/$1/jni
116+
mkdir $PWD/build/$1/jni/$1
117+
cp -rfv $distFolder/libs/$1 $PWD/build/$1/jni
118+
rm $PWD/build/$1/jni/$1/libSDL2.so
119+
rm $PWD/build/$1/jni/$1/libSDL2_image.so
120+
rm $PWD/build/$1/jni/$1/libSDL2_mixer.so
121+
rm $PWD/build/$1/jni/$1/libSDL2_ttf.so
122+
123+
#Copy *.mp3 file
124+
mkdir $PWD/build/$1/assets
125+
cp -rfv $distFolder/src/main/assets/private.mp3 $PWD/build/$1/assets/private-$1.mp3
126+
echo "[INFO] Copy assets [$1] done"
127+
128+
echo "[INFO] Make aar [$1]"
129+
#Create aar file
130+
root=$PWD
131+
cd $root/build/$1
132+
zip $root/build/$1.aar -r ./*
133+
cd $root
134+
echo "[INFO] Make aar [$1] done"
135+
}
136+
137+
98138
clean
99139

100140
build "armeabi-v7a"
101141
#build "x86"
102142
build "arm64-v8a"
103143

104-
copy_assets_to_androidYoutubeDlProject
144+
#copy_assets_to_androidYoutubeDlProject
105145
echo "[INFO] Build done"

0 commit comments

Comments
 (0)