Fix standalone Android and NaCl Makefiles to support arm_version=7 and optdebug

R=ulan@chromium.org

Review URL: https://codereview.chromium.org/116423002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18315 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

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}

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