Android build target for libadblockplus

Makefile.android

Index: Makefile.android
===================================================================
new file mode 100644
--- /dev/null
+++ b/Makefile.android
@@ -0,0 +1,76 @@
+PATCH ?= patch
+# Those definitions should be consistent with the main Makefile
+ANDROID_ARCHES = android_ia32 android_arm android_mipsel
+MODES = release debug
+# Generates all combinations of ANDROID ARCHES and MODES,
+# e.g. "android_ia32.release" or "android_arm.release"
+ANDROID_BUILDS = $(foreach mode,$(MODES), \
+                   $(addsuffix .$(mode),$(ANDROID_ARCHES)))
+
+HOST_OS = $(shell uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
+ifeq ($(HOST_OS), linux)
+  TOOLCHAIN_DIR = linux-x86
+else
+  ifeq ($(HOST_OS), mac)
+    TOOLCHAIN_DIR = darwin-x86
+  else
+    $(error Host platform "${HOST_OS}" is not supported)
+  endif
+endif
+
+ifeq ($(ARCH), android_arm)
+  DEFINES  = target_arch=arm v8_target_arch=arm android_target_arch=arm

[Wladimir Palant, 2013/05/07 08:18:54]

Setting v8_target_arch explicitly shouldn't be necessary, the gyp file
initializes it with target_arch anyway.

+  DEFINES += arm_neon=0 armv7=1
+  TOOLCHAIN_ARCH = arm-linux-androideabi-4.6
+else
+  ifeq ($(ARCH), android_mipsel)
+    DEFINES  = target_arch=mipsel v8_target_arch=mipsel android_target_arch=mips
+    DEFINES += mips_arch_variant=mips32r2
+    TOOLCHAIN_ARCH = mipsel-linux-android-4.6
+  else
+    ifeq ($(ARCH), android_ia32)
+      DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86
+      TOOLCHAIN_ARCH = x86-4.6
+    else
+      $(error Target architecture "${ARCH}" is not supported)
+    endif
+  endif
+endif
+
+TOOLCHAIN_PATH = ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_ARCH}/prebuilt
+ANDROID_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR}
+ifeq ($(wildcard $(ANDROID_TOOLCHAIN)),)
+  $(error Cannot find Android toolchain in "${ANDROID_TOOLCHAIN}")
+endif
+
+DEFINES += host_os=${HOST_OS} OS=android
+
+.PHONY: v8
+
+must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN:
+ifndef ANDROID_NDK_ROOT
+ifndef ANDROID_TOOLCHAIN
+          $(error ANDROID_NDK_ROOT or ANDROID_TOOLCHAIN must be set))
+endif
+endif
+
+v8:
+	$(PATCH) -d third_party/v8 < patches/V8.patch

[Andrey Novikov, 2013/04/30 20:16:05]

I do not like this approach because it is not error-safe but fetching another
copy of GYP I like less.

[Wladimir Palant, 2013/05/07 08:18:54]

I don't like that approach either. You don't need a new GYP copy, build/gyp/gyp
is merely a launcher. A simple Python file should do:

#!/usr/bin/env python
if __name__ == '__main__':
  import sys, os
  script_dir = os.path.dirname(sys.argv[0])
  sys.path.append(os.path.join(script_dir, '..', '..', '..', 'gyp', 'pylib'))
  import gyp
  sys.exit(gyp.main(sys.argv[1:]))

+	OUTDIR=../../build $(MAKE) -C third_party/v8 vfp3=off armv7=false $(ARCH).$(MODE)
+	$(PATCH) -d third_party/v8 -R < patches/V8.patch
+
+$(ANDROID_BUILDS): must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN v8
+	@GYP_GENERATORS=make-android \
+	GYP_DEFINES="${DEFINES}" \
+	CC="$(ANDROID_TOOLCHAIN)/bin/*-gcc" \
+	CXX="$(ANDROID_TOOLCHAIN)/bin/*-g++" \
+	third_party/gyp/gyp --depth=. -I common.gypi -I third_party/v8/build/standalone.gypi --generator-output=build -Dtarget_arch=$(ARCH) libadblockplus.gyp

[Wladimir Palant, 2013/05/07 08:18:54]

Why do we need to include standalone.gypi? We don't usually include it, it
messes up googletest among other things. It's probably worth changing our
common.gypi and making sure want_separate_host_toolset is set for Android
targets. Also, we might need to define arm_fpu=none explicitly (we used to patch
out CAN_USE_VFP_INSTRUCTIONS for that, however it seems that this is properly
configurable now). From what I tell, we don't need standalone.gypi other than
for that.

+	$(MAKE) V=1 -C build \
+	CXX="$(ANDROID_TOOLCHAIN)/bin/*-g++" \
+	AR="$(ANDROID_TOOLCHAIN)/bin/*-ar" \
+	RANLIB="$(ANDROID_TOOLCHAIN)/bin/*-ranlib" \
+	CC="$(ANDROID_TOOLCHAIN)/bin/*-gcc" \
+	LD="$(ANDROID_TOOLCHAIN)/bin/*-ld" \
+	LINK="$(ANDROID_TOOLCHAIN)/bin/*-g++" \
+	BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \
+	            python -c "print raw_input().capitalize()")