Reviewers: ulan,
Message:
PTAL.
Description:
Fix standalone Android and NaCl Makefiles to support arm_version=7 and
optdebug
Please review this at https://codereview.chromium.org/116423002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+10, -10 lines):
M Makefile.android
M Makefile.nacl
Index: Makefile.android
diff --git a/Makefile.android b/Makefile.android
index
2d45d3bb122f9f4192227b1ab8d303ddf7b74297..fad5fe9943aa7b594c7b16f8da463ad3a3588e52
100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -48,7 +48,7 @@ endif
ifeq ($(ARCH), android_arm)
DEFINES = target_arch=arm v8_target_arch=arm android_target_arch=arm
- DEFINES += arm_neon=0 armv7=1
+ DEFINES += arm_neon=0 arm_version=7
TOOLCHAIN_ARCH = arm-linux-androideabi-4.6
else
ifeq ($(ARCH), android_mipsel)
@@ -77,8 +77,8 @@ endif
DEFINES += host_os=${HOST_OS}
.SECONDEXPANSION:
-$(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$(basename $$@)
- @$(MAKE) -C "$(OUTDIR)" -f Makefile.$(basename $@) \
+$(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@
+ @$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \
CXX="$(ANDROID_TOOLCHAIN)/bin/*-g++" \
AR="$(ANDROID_TOOLCHAIN)/bin/*-ar" \
RANLIB="$(ANDROID_TOOLCHAIN)/bin/*-ranlib" \
@@ -90,13 +90,13 @@ $(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$(basename $$@)
builddir="$(shell pwd)/$(OUTDIR)/$@"
# Android GYP file generation targets.
-ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_ARCHES))
+ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS))
$(ANDROID_MAKEFILES):
- @GYP_GENERATORS=make-android \
+ GYP_GENERATORS=make-android \
GYP_DEFINES="${DEFINES}" \
CC="${ANDROID_TOOLCHAIN}/bin/*-gcc" \
CXX="${ANDROID_TOOLCHAIN}/bin/*-g++" \
PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
-Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
- -S.${ARCH} ${GYPFLAGS}
+ -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS}
Index: Makefile.nacl
diff --git a/Makefile.nacl b/Makefile.nacl
index
2c79ef113e3dbc99a9d2a669529484d42d97c92c..fc3eb28ae0a5439fd12a34d8b6942862805693c1
100644
--- a/Makefile.nacl
+++ b/Makefile.nacl
@@ -77,11 +77,11 @@ GYPENV += host_os=${HOST_OS}
# ICU doesn't support NaCl.
GYPENV += v8_enable_i18n_support=0
-NACL_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(NACL_ARCHES))
+NACL_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(NACL_BUILDS))
.SECONDEXPANSION:
# For some reason the $$(basename $$@) expansion didn't work here...
$(NACL_BUILDS): $(NACL_MAKEFILES)
- @$(MAKE) -C "$(OUTDIR)" -f Makefile.$(basename $@) \
+ @$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \
CXX=${NACL_CXX} \
LINK=${NACL_LINK} \
BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \
@@ -90,12 +90,12 @@ $(NACL_BUILDS): $(NACL_MAKEFILES)
# NACL GYP file generation targets.
$(NACL_MAKEFILES):
- @GYP_GENERATORS=make \
+ GYP_GENERATORS=make \
GYP_DEFINES="${GYPENV}" \
CC=${NACL_CC} \
CXX=${NACL_CXX} \
PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
-Ibuild/standalone.gypi --depth=. \
- -S.$(subst .,,$(suffix $@)) $(GYPFLAGS) \
+ -S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS) \
-Dwno_array_bounds=-Wno-array-bounds
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
