Skip to content

Commit dc12ea2

Browse files
committed
add rename rules for android prebuilt libraries
1 parent 1fce9ee commit dc12ea2

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

build/android.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ cfg_default_build_libraries="all"
66
#specific default values
77
cfg_default_build_api=19
88
cfg_default_gcc_version=4.8
9+
cfg_arm_alias_folder_name="armeabi"
10+
cfg_armv7_alias_folder_name="armeabi-v7a"
11+
cfg_arm64_alias_folder_name="armeabi-v8a"
12+
913

1014
#help message strings goes here
1115
cfg_help_arch_string="arm,armv7,x86,arm64"

build/build.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,14 @@ do
346346
echo "OPTIM := ${OPTIM}" >> config.mak
347347

348348
cd -
349+
350+
parse_arch_folder_name=cfg_${arch}_alias_folder_name
351+
original_arch_folder_name=${!parse_arch_folder_name}
352+
if [ -z $original_arch_folder_name ];then
353+
original_arch_folder_name=$arch
354+
fi
349355

350-
local_library_install_path=$cfg_platform_name/$archive_name/prebuilt/$arch
356+
local_library_install_path=$cfg_platform_name/$archive_name/prebuilt/$original_arch_folder_name
351357
if [ ! -d $local_library_install_path ]; then
352358
echo "create folder for library with specify arch. $local_library_install_path"
353359
mkdir -p $local_library_install_path
@@ -372,7 +378,7 @@ do
372378

373379
for dep_archive in ${original_dependent_archive_list[@]}
374380
do
375-
local_library_install_path=$cfg_platform_name/${dep_archive}/prebuilt/$arch
381+
local_library_install_path=$cfg_platform_name/${dep_archive}/prebuilt/$original_arch_folder_name
376382
mkdir -p $local_library_install_path
377383
cp $top_dir/contrib/$install_library_path/$arch/lib/lib${dep_archive}.a $local_library_install_path/lib${dep_archive}.a
378384

0 commit comments

Comments
 (0)