Build V8 for Android IA

Makefile

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 16 matching lines @@
 
 
 # Variable default definitions. Override them by exporting them in your shell.
 CXX ?= g++
 LINK ?= g++
 OUTDIR ?= out
 TESTJOBS ?= -j16
 GYPFLAGS ?=
 TESTFLAGS ?=
 ANDROID_NDK_ROOT ?=
-ANDROID_TOOL_PREFIX = $(ANDROID_NDK_ROOT)/toolchain/bin/arm-linux-androideabi
 ANDROID_V8 ?= /data/local/v8
 
 # Special build flags. Use them like this: "make library=shared"
 
 # library=shared || component=shared_library
 ifeq ($(library), shared)
   GYPFLAGS += -Dcomponent=shared_library
 endif
 ifdef component
   GYPFLAGS += -Dcomponent=$(component)
@@ skipping 66 matching lines @@
 # - "<arch>.clean" for any <arch> in ARCHES
 # - "clean": clean all ARCHES
 
 # ----------------- internal stuff ------------------------
 
 # Architectures and modes to be compiled. Consider these to be internal
 # variables, don't override them (use the targets instead).
 ARCHES = ia32 x64 arm mipsel
 DEFAULT_ARCHES = ia32 x64 arm
 MODES = release debug
+ANDROID_ARCHES = ia32.android arm.android

[Jakob Kummerow, 2012/07/17 16:29:57]

Can we swap these around (to "android.ia32")? Just for the sake of easier tab
completion in the out/ dir ;-)
(See also my comment below regarding "android_ia32" with an underscore.)

 ANDROID_MODES = android.release android.debug
 
 # List of files that trigger Makefile regeneration:
 GYPFILES = build/all.gyp build/common.gypi build/standalone.gypi \
            preparser/preparser.gyp samples/samples.gyp src/d8.gyp \
            test/cctest/cctest.gyp tools/gyp/v8.gyp
 
 # Generates all combinations of ARCHES and MODES, e.g. "ia32.release".
 BUILDS = $(foreach mode,$(MODES),$(addsuffix .$(mode),$(ARCHES)))
+ANDROID_BUILDS = $(foreach mode,$(suffix $(ANDROID_MODES)), \

[Jakob Kummerow, 2012/07/17 16:29:57]

Let's s/$(suffix $(ANDROID_MODES))/$(MODES)/ here and below, and remove
ANDROID_MODES entirely.

+                   $(addsuffix $(mode),$(ANDROID_ARCHES)))
 # Generates corresponding test targets, e.g. "ia32.release.check".
 CHECKS = $(addsuffix .check,$(BUILDS))
+ANDROID_CHECKS = $(addsuffix .check,$(ANDROID_BUILDS))
 # File where previously used GYPFLAGS are stored.
 ENVFILE = $(OUTDIR)/environment
 
 .PHONY: all check clean dependencies $(ENVFILE).new native \
         $(ARCHES) $(MODES) $(BUILDS) $(CHECKS) $(addsuffix .clean,$(ARCHES)) \
         $(addsuffix .check,$(MODES)) $(addsuffix .check,$(ARCHES)) \
+        $(ANDROID_ARCHES) $(ANDROID_BUILD) $(ANDROID_CHECKS) \

[Jakob Kummerow, 2012/07/17 16:29:57]

s/ANDROID_BUILD/ANDROID_BUILDS/

         must-set-ANDROID_NDK_ROOT
 
 # Target definitions. "all" is the default.
 all: $(MODES)
 
 # Special target for the buildbots to use. Depends on $(OUTDIR)/Makefile
 # having been created before.
 buildbot:
         $(MAKE) -C "$(OUTDIR)" BUILDTYPE=$(BUILDTYPE) \
                 builddir="$(abspath $(OUTDIR))/$(BUILDTYPE)"
@@ skipping 14 matching lines @@
                  CXX="$(CXX)" LINK="$(LINK)" \
                  BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \
                              python -c "print raw_input().capitalize()") \
                  builddir="$(shell pwd)/$(OUTDIR)/$@"
 
 native: $(OUTDIR)/Makefile.native
         @$(MAKE) -C "$(OUTDIR)" -f Makefile.native \
                  CXX="$(CXX)" LINK="$(LINK)" BUILDTYPE=Release \
                  builddir="$(shell pwd)/$(OUTDIR)/$@"
 
-android: $(ANDROID_MODES)
+$(ANDROID_ARCHES): $(addprefix $$@,$(suffix $(ANDROID_MODES)))

[Jakob Kummerow, 2012/07/17 16:29:57]

Again, s/$(suffix $(ANDROID_MODES))/$(MODES)/.

 
-$(ANDROID_MODES): $(OUTDIR)/Makefile.android
-        @$(MAKE) -C "$(OUTDIR)" -f Makefile.android \
-                CXX="$(ANDROID_TOOL_PREFIX)-g++" \
-                AR="$(ANDROID_TOOL_PREFIX)-ar" \
-                RANLIB="$(ANDROID_TOOL_PREFIX)-ranlib" \
-                CC="$(ANDROID_TOOL_PREFIX)-gcc" \
-                LD="$(ANDROID_TOOL_PREFIX)-ld" \
-                LINK="$(ANDROID_TOOL_PREFIX)-g++" \
+$(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$(basename $$@)
+        $(MAKE) -C "$(OUTDIR)" -f Makefile.$(basename $@) \
+                CXX="$(shell ls $(ANDROID_TOOLCHAIN)/*-g++)" \
+                AR="$(shell ls $(ANDROID_TOOLCHAIN)/*-ar)" \
+                RANLIB="$(shell ls $(ANDROID_TOOLCHAIN)/*-ranlib)" \
+                CC="$(shell ls $(ANDROID_TOOLCHAIN)/*-gcc)" \
+                LD="$(shell ls $(ANDROID_TOOLCHAIN)/*-ld)" \
+                LINK="$(shell ls $(ANDROID_TOOLCHAIN)/*-g++)" \
                 BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \
                             python -c "print raw_input().capitalize()") \
                 builddir="$(shell pwd)/$(OUTDIR)/$@"
 
 # Test targets.
 check: all
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch=$(shell echo $(DEFAULT_ARCHES) | sed -e 's/ /,/g') \
             $(TESTFLAGS)
 
 $(addsuffix .check,$(MODES)): $$(basename $$@)
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --mode=$(basename $@) $(TESTFLAGS)
 
 $(addsuffix .check,$(ARCHES)): $$(basename $$@)
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch=$(basename $@) $(TESTFLAGS)
 
 $(CHECKS): $$(basename $$@)
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
             --arch-and-mode=$(basename $@) $(TESTFLAGS)
 
-$(addsuffix .sync, $(ANDROID_MODES)): $$(basename $$@)
+$(addsuffix .sync, $(ANDROID_BUILDS)): $$(basename $$@)
         @tools/android-sync.sh $(basename $@) $(OUTDIR) \
                                $(shell pwd) $(ANDROID_V8)
 
-$(addsuffix .check, $(ANDROID_MODES)): $$(basename $$@).sync
+$(addsuffix .check, $(ANDROID_BUILDS)): $$(basename $$@).sync
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR) \
              --arch-and-mode=$(basename $@) \
              --special-command="tools/android-run.py @"
 
-android.check: android.release.check android.debug.check
-
+$(addsuffix .check, $(ANDROID_ARCHES)): $$(basename $$@).debug.check \
+                                        $$(basename $$@).release.check
 native.check: native
         @tools/test-wrapper-gypbuild.py $(TESTJOBS) --outdir=$(OUTDIR)/native \
             --arch-and-mode=. $(TESTFLAGS)
 
 # Clean targets. You can clean each architecture individually, or everything.
-$(addsuffix .clean,$(ARCHES)) android.clean:
+$(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES)):
         rm -f $(OUTDIR)/Makefile.$(basename $@)
         rm -rf $(OUTDIR)/$(basename $@).release
         rm -rf $(OUTDIR)/$(basename $@).debug
         find $(OUTDIR) -regex '.*\(host\|target\).$(basename $@)\.mk' -delete
 
 native.clean:
         rm -f $(OUTDIR)/Makefile.native
         rm -rf $(OUTDIR)/native
         find $(OUTDIR) -regex '.*\(host\|target\).native\.mk' -delete
 
-clean: $(addsuffix .clean,$(ARCHES)) native.clean android.clean
+clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES)) native.clean
 
 # GYP file generation targets.
 MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ARCHES))
 $(MAKEFILES): $(GYPFILES) $(ENVFILE)
         GYP_GENERATORS=make \
         build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
                       -Ibuild/standalone.gypi --depth=. \
                       -Dv8_target_arch=$(subst .,,$(suffix $@)) \
                       -S.$(subst .,,$(suffix $@)) $(GYPFLAGS)
 
 $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
         GYP_GENERATORS=make \
         build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
                       -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)
 
-$(OUTDIR)/Makefile.android: $(GYPFILES) $(ENVFILE) build/android.gypi \
+ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_ARCHES))
+$(ANDROID_MAKEFILES): $(GYPFILES) $(ENVFILE) build/android.gypi \
                             must-set-ANDROID_NDK_ROOT
         GYP_GENERATORS=make \
-        CC="${ANDROID_TOOL_PREFIX}-gcc" \
-        CXX="${ANDROID_TOOL_PREFIX}-g++" \
+        CC="$(shell ls $(ANDROID_TOOLCHAIN)/*-gcc)" \
+        CXX="$(shell ls $(ANDROID_TOOLCHAIN)/*-g++)" \
         build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
                       -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
-                      -S.android $(GYPFLAGS)
+                      -S$(suffix $(basename $@)).$(subst .,,$(suffix $@)) \

[Jakob Kummerow, 2012/07/17 16:29:57]

This line would become simpler if you defined:
ANDROID_ARCHES = android_ia32 android_arm
and I don't see a reason why underscores instead of dots would hurt (it might
make it more difficult to fix the test runner script, though).
If you prefer the dots, that's fine too, this is just a suggestion. (The reason
we use dots for "ia32.release" etc. is just so that $(basename ...) and $(suffix
...) are useful.)

+                      $(GYPFLAGS)
 
 must-set-ANDROID_NDK_ROOT:
 ifndef ANDROID_NDK_ROOT
           $(error ANDROID_NDK_ROOT is not set)
 endif
 
 # Replaces the old with the new environment file if they're different, which
 # will trigger GYP to regenerate Makefiles.
 $(ENVFILE): $(ENVFILE).new
         @if test -r $(ENVFILE) && cmp $(ENVFILE).new $(ENVFILE) >/dev/null; \
             then rm $(ENVFILE).new; \
             else mv $(ENVFILE).new $(ENVFILE); fi
 
 # Stores current GYPFLAGS in a file.
 $(ENVFILE).new:
         @mkdir -p $(OUTDIR); echo "GYPFLAGS=$(GYPFLAGS)" > $(ENVFILE).new; \
             echo "CXX=$(CXX)" >> $(ENVFILE).new
 
 # Dependencies.
 dependencies:
         svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \
             --revision 1282