Skip to content

Commit ec32708

Browse files
committed
make android scripts working
1 parent 472943a commit ec32708

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

build/android/build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,11 @@ cocos_root=`pwd`/../..
113113

114114
export ANDROID_ABI
115115
export ANDROID_API
116-
# export LDFLAGS="-L${ANDROID_NDK}/platforms/${ANDROID_API}/arch-${ANDROID_ARCH}/usr/lib"
117-
# info "LD FLAGS SELECTED = '${LDFLAGS}'"
116+
117+
if [ "$ANDROID_ABI" = "armeabi-v7a" ]; then
118+
export LDFLAGS="-march=armv7-a -Wl,--fix-cortex-a8"
119+
fi
120+
info "LD FLAGS SELECTED = '${LDFLAGS}'"
118121

119122
export PATH="${toolchain_bin}:${cocos_root}/extras/tools/bin:$PATH"
120123
if [ "$ANDROID_ABI" = "armeabi-v7a" ]; then

build/android/build_with_no_export.sh renamed to build/android/build_without_export.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export ANDROID_API
118118

119119
export PATH="${toolchain_bin}:${cocos_root}/extras/tools/bin:$PATH"
120120
if [ "$ANDROID_ABI" = "armeabi-v7a" ]; then
121-
export CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Os -DNDEBUG -fomit-frame-pointer -fno-strict-aliasing -DANDROID -Wa,--noexecstack -Wformat -Werror=format-security "
121+
CFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -Os -DNDEBUG -fomit-frame-pointer -fno-strict-aliasing -DANDROID -Wa,--noexecstack -Wformat -Werror=format-security "
122122
elif [ "$ANDROID_ABI" = "armeabi" ]; then
123123
CFLAGS="-ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes -march=armv5te -mtune=xscale -msoft-float -mthumb -Os -DNDEBUG -fomit-frame-pointer -fno-strict-aliasing -DANDROID -Wa,--noexecstack -Wformat -Werror=format-security"
124124
else

build/ios/build_luajit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ current_dir=`pwd`
22
library_name=luajit
33
# build for armv7
44
arch=armv7
5-
./build_without_config.sh -a $arch -l $library_name
5+
./build_without_export.sh -a $arch -l $library_name
66
top_dir=$current_dir/../..
77

88
cd $current_dir
File renamed without changes.

0 commit comments

Comments
 (0)