Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: Makefile.android

Issue 2003513002: [build] Fix d8-for-Android builds (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 else 59 else
60 $(error Target architecture "${ARCH}" is not supported) 60 $(error Target architecture "${ARCH}" is not supported)
61 endif 61 endif
62 62
63 # Common flags. 63 # Common flags.
64 DEFINES += OS=android 64 DEFINES += OS=android
65 65
66 .SECONDEXPANSION: 66 .SECONDEXPANSION:
67 $(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@ 67 $(ANDROID_BUILDS): $(OUTDIR)/Makefile.$$@
68 @$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \ 68 @$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \
69 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.
70 BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \ 69 BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \
71 python -c "print raw_input().capitalize()") \ 70 python -c "print raw_input().capitalize()") \
72 builddir="$(shell pwd)/$(OUTDIR)/$@" 71 builddir="$(shell pwd)/$(OUTDIR)/$@"
73 72
74 # Android GYP file generation targets. 73 # Android GYP file generation targets.
75 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS)) 74 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS))
76 $(ANDROID_MAKEFILES): 75 $(ANDROID_MAKEFILES):
77 GYP_GENERATORS=make-android \ 76 GYP_GENERATORS=make-android \
78 GYP_DEFINES="${DEFINES}" \ 77 GYP_DEFINES="${DEFINES}" \
79 » PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build: $(PYTHONPATH)" \ 78 » PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/gypfil es:$(PYTHONPATH)" \
Jakob Kummerow 2016/05/20 09:44:15 This fixes: gyp: Error importing pymod_do_mainmod
80 tools/gyp/gyp --generator-output="${OUTDIR}" gypfiles/all.gyp \ 79 tools/gyp/gyp --generator-output="${OUTDIR}" gypfiles/all.gyp \
81 -Igypfiles/standalone.gypi --depth=. \ 80 -Igypfiles/standalone.gypi --depth=. \
82 -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS} 81 -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS}
OLDNEW
« no previous file with comments | « no previous file | test/cctest/compiler/codegen-tester.h » ('j') | test/cctest/compiler/codegen-tester.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698