tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] Use 'nodejs' if 'node' is not found in android-configuration

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2017-04-06 15:15:16 +03:00
parent df22b614af
commit 76edc6ee69
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -309,7 +309,7 @@ test: $(LINUX_BUILD)
benchmark: $(LINUX_BUILD)
$(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-benchmark
ifneq (,$(shell which gdb))
ifneq (,$(shell command -v gdb))
GDB = gdb -batch -return-child-result -ex 'set print thread-events off' -ex 'run' -ex 'thread apply all bt' --args
endif
@@ -496,7 +496,7 @@ style-code: android-style-code
# Configuration file for running CMake from Gradle within Android Studio.
platform/android/configuration.gradle:
@echo "ext {\n node = '`which node`'\n npm = '`which npm`'\n ccache = '`which ccache`'\n}" > $@
@echo "ext {\n node = '`command -v node | command -v nodejs`'\n npm = '`command -v npm`'\n ccache = '`command -v ccache`'\n}" > $@
define ANDROID_RULES
# $1 = arm-v7 (short arch)