Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mult android arch #424

Merged
merged 8 commits into from
Dec 16, 2015
Merged

Mult android arch #424

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
366a9c5
Add building for multiple arch for android
tallytalwar Dec 3, 2015
35f3f61
Ask travis to build all android arch before deploy
tallytalwar Dec 3, 2015
ef3c26d
Use deploy-all-arch branch for mindk
tallytalwar Dec 3, 2015
2621800
64 bit arch require android-21
tallytalwar Dec 4, 2015
e000a5a
test
tallytalwar Dec 3, 2015
e0d3252
workaround for ndk r10e (mips,armeabi) - link atomic
hjanetzek Dec 14, 2015
373c652
add make android-native-lib and android-tangram-apk
hjanetzek Dec 14, 2015
afc4032
Trimming ARCH and for master branch
tallytalwar Dec 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add building for multiple arch for android 
- Supports: x86, x86_64, armeabi, armeabi-v7a (default), arm64_v8a, mips, mips64

NOTE/TODO: Figure out linking error for `armeabi` and `mips` architectures.
  • Loading branch information
@tallytalwar @hjanetzek
tallytalwar authored and hjanetzek committed Dec 14, 2015
commit 366a9c5fae82792ed51ecde1628e0de618821e6e
34 changes: 27 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,37 @@ ifdef RELEASE
BUILD_TYPE = -DCMAKE_BUILD_TYPE=Release
endif

ifdef ANDROID_X86
ANDROID_BUILD_DIR = build/android-x86
ANDROID_TOOLCHAIN = x86-clang3.6
ANDROID_ARCH = x86
ifdef ANDROID_ARCH
ANDROID_BUILD_DIR = build/android-${ANDROID_ARCH}
ifeq ($(ANDROID_ARCH), x86)
ANDROID_TOOLCHAIN = x86-clang3.6
endif
ifeq ($(ANDROID_ARCH), x86_64)
ANDROID_TOOLCHAIN = x86_64-clang3.6
endif
ifeq ($(ANDROID_ARCH), armeabi) #TODO: Does not work - linking error
ANDROID_TOOLCHAIN = arm-linux-androideabi-clang3.6
endif
ifeq ($(ANDROID_ARCH), armeabi-v7a)
ANDROID_TOOLCHAIN = arm-linux-androideabi-clang3.6
endif
ifeq ($(ANDROID_ARCH), arm64-v8a)
ANDROID_TOOLCHAIN = aarch64-linux-android-clang3.6
endif
ifeq ($(ANDROID_ARCH), mips) #TODO: Does not work - linking error
ANDROID_TOOLCHAIN = mipsel-linux-android-clang3.6
endif
ifeq ($(ANDROID_ARCH), mips64)
ANDROID_TOOLCHAIN = mips64el-linux-android-clang3.6
endif
else
ANDROID_ARCH = armeabi-v7a
ANDROID_TOOLCHAIN = arm-linux-androideabi-clang3.6
endif

ifndef ANDROID_ARCH
ANDROID_ARCH = armeabi-v7a
endif
#$(info ANDROID_ARCH is ${ANDROID_ARCH})
#$(info ANDROID_TOOLCHAIN is ${ANDROID_TOOLCHAIN})
#$(info ANDROID_BUILD_DIR is ${ANDROID_BUILD_DIR})

ifndef ANDROID_API_LEVEL
ANDROID_API_LEVEL = android-15
Expand Down