Index: Makefile.android |
diff --git a/Makefile.android b/Makefile.android |
index fd5f968736b5d3e5d39d794d8f3743dccb1ef958..4674aaf217b2c7bb1f70c52797036cd300c716a5 100644 |
--- a/Makefile.android |
+++ b/Makefile.android |
@@ -66,7 +66,6 @@ DEFINES += OS=android |
.SECONDEXPANSION: |
$(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@ |
@$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \ |
- AR="$(ANDROID_TOOLCHAIN)/ar" \ |
Jakob Kummerow
2016/05/20 09:44:15
Dropping this line fixes:
/bin/sh: /toolchains/ar
Jarin
2016/05/20 10:04:53
So why do not need to compute the ANDROID_TOOLCHAI
Jakob Kummerow
2016/05/20 11:34:45
Good point. Dropped.
|
BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \ |
python -c "print raw_input().capitalize()") \ |
builddir="$(shell pwd)/$(OUTDIR)/$@" |
@@ -76,7 +75,7 @@ ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS)) |
$(ANDROID_MAKEFILES): |
GYP_GENERATORS=make-android \ |
GYP_DEFINES="${DEFINES}" \ |
- PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:$(PYTHONPATH)" \ |
+ PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/gypfiles:$(PYTHONPATH)" \ |
Jakob Kummerow
2016/05/20 09:44:15
This fixes:
gyp: Error importing pymod_do_mainmod
|
tools/gyp/gyp --generator-output="${OUTDIR}" gypfiles/all.gyp \ |
-Igypfiles/standalone.gypi --depth=. \ |
-S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS} |