refactor Android abi name and make luajit build successfully

Author: zilongshanren

build/android.ini

@@ -4,8 +4,8 @@ cfg_default_build_arches="all"
 cfg_default_build_mode="release"
 cfg_default_build_libraries="all"
 #specific default values
-cfg_default_build_api=19
-cfg_default_gcc_version=4.8
+cfg_default_build_api=21
+cfg_default_gcc_version=4.9
 cfg_arm_alias_folder_name="armeabi"
 cfg_armv7_alias_folder_name="armeabi-v7a"
 cfg_arm64_alias_folder_name="armeabi-v8a"

build/build.sh

@@ -302,7 +302,13 @@ do
 
         echo "build $arch for $lib in $cfg_platform_name"
 
-        MY_TARGET_ARCH=$arch
+        parse_arch_folder_name=cfg_${arch}_alias_folder_name
+        original_arch_name=${!parse_arch_folder_name}
+        if [ -z $original_arch_name ];then
+            original_arch_name=$arch
+        fi
+        
+        MY_TARGET_ARCH=$original_arch_name
         export MY_TARGET_ARCH
 
         if [ ${cfg_is_cross_compile} = "yes" ];then
@@ -338,22 +344,15 @@ do
                      --host=${!my_target_host} \
                      --prefix=${PREFIX}
 
-        make fetch
-        make list
-        make
 
         echo "MY_TARGET_ARCH := ${MY_TARGET_ARCH}" >> config.mak
         echo "OPTIM := ${OPTIM}" >> config.mak
+        
+        make
 
         cd -    
-
-        parse_arch_folder_name=cfg_${arch}_alias_folder_name
-        original_arch_folder_name=${!parse_arch_folder_name}
-        if [ -z $original_arch_folder_name ];then
-            original_arch_folder_name=$arch
-        fi
 
-        local_library_install_path=$cfg_platform_name/$archive_name/prebuilt/$original_arch_folder_name
+        local_library_install_path=$cfg_platform_name/$archive_name/prebuilt/$original_arch_name
         if [ ! -d $local_library_install_path ]; then
             echo "create folder for library with specify arch. $local_library_install_path"
             mkdir -p $local_library_install_path
@@ -378,7 +377,7 @@ do
 
             for dep_archive in ${original_dependent_archive_list[@]}
             do
-                local_library_install_path=$cfg_platform_name/${dep_archive}/prebuilt/$original_arch_folder_name
+                local_library_install_path=$cfg_platform_name/${dep_archive}/prebuilt/$original_arch_name
                 mkdir -p $local_library_install_path
                 cp $top_dir/contrib/$install_library_path/$arch/lib/lib${dep_archive}.a $local_library_install_path/lib${dep_archive}.a
 

build/main.ini

@@ -4,15 +4,16 @@ cfg_all_valid_platforms=(ios mac android linux win32 tizen)
 
 #copy libraries header files
 png_header_files=png*.h
-luajit_header_files=luajit-2.0/
+luajit_header_files=luajit-2.0
 lua_header_files=l*.h*
-curl_header_files=curl/
-freetyp2_header_files=freetype2/
+curl_header_files=curl
+freetype_header_files=freetype2
 jpeg_header_files=j*.h
 tiff_header_files=tif*.h
-webp_header_files=webp/
+webp_header_files=webp
 websockets_header_files=libwebsockets.h
 zlib_header_files=z*.h
+chipmunk_header_files=chipmunk
 
 
 ##archive prebuilt name

contrib/bootstrap

@@ -227,14 +227,14 @@ check_android_sdk()
         ## FIXME: the android toolchain path is hardcoded, only MACOSX will work.
         if [ ${ANDROID_ABI} = "x86" ]; then
             toolchain_path_prefix=x86
-        elif [ ${ANDROID_ABI} = "arm64" ];then
+        elif [ ${ANDROID_ABI} = "armeabi-v8a" ];then
             toolchain_path_prefix=aarch64-linux-android
         else
             toolchain_path_prefix=arm-linux-androideabi
         fi
 
         # check whether sysroot is exists
-        if [ $ANDROID_ABI = "arm64" ]; then
+        if [ $ANDROID_ABI = "armeabi-v8a" ]; then
             if [ ! -d ${ANDROID_NDK}/platforms/${ANDROID_API}/arch-arm64 ];then
                 echo "${ANDROID_NDK} ${ANDROID_API} doesn't support build arm64 architecture!"
                 exit $? 
@@ -248,19 +248,19 @@ check_android_sdk()
         fi
 
 
-	if [ ${ANDROID_ABI} = "armv7" ]; then
+	if [ ${ANDROID_ABI} = "armeabi-v7a" ]; then
             add_make_enabled "HAVE_NEON"
             add_make_enabled "HAVE_ARMV7A"
             add_make "EXTRA_CFLAGS := -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat "
             add_make "EXTRA_LDFLAGS := -march=armv7-a -Wl,--fix-cortex-a8"
         fi
 
-	if [ ${ANDROID_ABI} = "arm" -a -z "${NO_ARMV6}" ];then
+	if [ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ];then
             add_make_enabled "HAVE_ARMV6"
             add_make "EXTRA_CFLAGS := -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes  -march=armv5te -mtune=xscale -msoft-float -mthumb -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat "
         fi
 
-	if [ ${ANDROID_ABI} = "arm64" ]; then
+	if [ ${ANDROID_ABI} = "armeabi-v8a" ]; then
             add_make_enabled "HAVE_NEON"
             add_make_enabled "HAVE_ARMV8A"
             add_make "EXTRA_CFLAGS :=  -fpic -ffunction-sections  -funwind-tables  -fstack-protector  -no-canonical-prefixes"

contrib/src/luajit/rules.mak

@@ -38,7 +38,7 @@ endif
 
 .luajit: luajit
 ifdef HAVE_ANDROID
-	cd $< && $(MAKE) HOST_CC="gcc -m32 $(OPTIM)" CROSS=$(HOST)- TARGET_SYS=Linux TARGET_FLAGS="${MY_TARGET_ARCH} ${NDKF}" TARGET_LDFLAGS=$(LUAJIT_LDFLAGS)
+	cd $< && $(MAKE) HOST_CC="gcc -m32 $(OPTIM)" CROSS=$(HOST)- TARGET_SYS=Linux TARGET_FLAGS="${NDKF} ${EXTRA_CFLAGS}" TARGET_LDFLAGS=$(LUAJIT_LDFLAGS)
 endif
 ifdef HAVE_MACOSX
 	cd $< && $(HOSTVARS_PIC) $(MAKE) HOST_CC="$(CC)" HOST_CFLAGS="$(CFLAGS)"