Issue 5267 - Add support of 64 bit android

Makefile

 V8_DIR :=$(shell pwd -L)/third_party/v8/
 HOST_ARCH :=$(shell python third_party/detect_v8_host_arch.py)
 
 GYP_PARAMETERS=host_arch=${HOST_ARCH}
 
 ifndef HOST_OS
   raw_OS = $(shell uname -s)
   ifeq (${raw_OS},Linux)
     HOST_OS=linux
   else ifeq (${raw_OS},Darwin)
     HOST_OS=mac
   endif
 endif
 
 ifneq "$(and ${LIBV8_LIB_DIR}, ${LIBV8_INCLUDE_DIR})" ""
 BUILD_V8=do-nothing
 ABP_GYP_PARAMETERS+= libv8_lib_dir=${LIBV8_LIB_DIR} libv8_include_dir=${LIBV8_INCLUDE_DIR}
 else
 BUILD_V8=build-v8
 endif
 
 ifneq ($(ANDROID_ARCH),)
 GYP_PARAMETERS+= OS=android target_arch=${ANDROID_ARCH}
 ifeq ($(ANDROID_ARCH),arm)
 ANDROID_ABI = armeabi-v7a
 else ifeq ($(ANDROID_ARCH),ia32)
 ANDROID_ABI = x86
+else ifeq ($(ANDROID_ARCH),arm64)
+ANDROID_ABI = arm64-v8a
 else
 $(error "Unsupported Android architecture: $(ANDROID_ARCH))
 endif
 ANDROID_DEST_DIR = android_$(ANDROID_ARCH).release
 
 ifeq "$(and ${LIBV8_LIB_DIR}, ${LIBV8_INCLUDE_DIR})" ""
 ABP_GYP_PARAMETERS+= libv8_lib_dir=${ANDROID_DEST_DIR}
 BUILD_V8=build-v8-android
 endif
 
@@ skipping 36 matching lines @@
 docs:
         doxygen
 
 clean:
         $(RM) -r build docs
 
 android_x86:
         ANDROID_ARCH="ia32" $(MAKE) android_multi
 
 android_arm:
         ANDROID_ARCH="arm" $(MAKE) android_multi

[hub, 2017/08/08 13:50:01]

Shouldn't we add a android_arm64 target here?

[sergei, 2017/08/08 15:47:32]

Right

 
 ifneq ($(ANDROID_ARCH),)
 v8_android_multi: ensure_dependencies
         cd third_party/v8 && GYP_GENERATORS=make-android \
           GYP_DEFINES="${GYP_PARAMETERS} v8_target_arch=${ANDROID_ARCH}" \
           PYTHONPATH="${V8_DIR}tools/generate_shim_headers:${V8_DIR}gypfiles:${PYTHONPATH}" \
           tools/gyp/gyp \
             --generator-output=../../build src/v8.gyp \
             -Igypfiles/standalone.gypi \
             --depth=. \
             -S.android_${ANDROID_ARCH}.release \
             -I../../android-v8-options.gypi
         cd third_party/v8 && make \
           -C ../../build \
           -f Makefile.android_${ANDROID_ARCH}.release \
           v8_snapshot v8_libplatform v8_libsampler \
           BUILDTYPE=Release \
           builddir=${V8_DIR}../../build/android_${ANDROID_ARCH}.release
 
 v8_android_multi_linux_${ANDROID_ARCH}: v8_android_multi
 
 v8_android_multi_mac_ia32: v8_android_multi
         find build/android_ia32.release/ -depth 1 -iname \*.a -exec ${ANDROID_NDK_ROOT}/toolchains/x86-4.9/prebuilt/darwin-x86_64/bin/i686-linux-android-ranlib {} \;
 
 v8_android_multi_mac_arm: v8_android_multi
         find build/android_arm.release/ -depth 1 -iname \*.a -exec ${ANDROID_NDK_ROOT}/toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ranlib {} \;
 
+v8_android_multi_mac_arm64: v8_android_multi
+        find build/android_arm64.release/ -depth 1 -iname \*.a -exec ${ANDROID_NDK_ROOT}/toolchains/aarch64-linux-android-4.9/prebuilt/darwin-x86_64/bin/aarch64-linux-android-ranlib {} \;
+
 build-v8-android: v8_android_multi_${HOST_OS}_${ANDROID_ARCH}
 
 android_multi: ${BUILD_V8} ensure_dependencies
         GYP_DEFINES="${GYP_PARAMETERS} ${ABP_GYP_PARAMETERS}" \
         python ./make_gyp_wrapper.py --depth=. -f make-android -Ilibadblockplus.gypi --generator-output=build -Gandroid_ndk_version=r9 libadblockplus.gyp

[hub, 2017/08/08 13:50:00]

I'm not sure how relevant that is, but ndk version r9 doesn't have aarch64
support. You need r21. So I would set android_ndk_version to r21 if we build on
aarch64.

[sergei, 2017/08/08 15:47:32]

Good catch.

It's for gyp and it seems the value is not used, it merely checks whether it's
set or not. I actually think that it should be rather 12b because we are using
NDK 12b, but it's another codereview. BTW, according to
https://developer.android.com/ndk/guides/application_mk.html the ABI is
supported starting from r7, though I doubt, because according to
https://developer.android.com/ndk/downloads/revision_history.html it has been
added only in NDK 10.

I think you are actually talking about APP_PLATFORM. It's the version of native
libraries and corresponding headers the code is being built with, and indeed
arch-arm64 appears only for the platform starting with the 21st. I have added
it.

[sergei, 2017/08/10 13:45:49]

See https://codereview.adblockplus.org/29511621/

         $(ANDROID_NDK_ROOT)/ndk-build -C build installed_modules \
         BUILDTYPE=Release \
         APP_ABI=$(ANDROID_ABI) \
         APP_PLATFORM=android-9 \
         APP_STL=c++_static \
         APP_BUILD_SCRIPT=Makefile \
         NDK_PROJECT_PATH=. \
         NDK_OUT=. \
         NDK_APP_DST_DIR=$(ANDROID_DEST_DIR)
 endif