Chromium Code Reviews| Index: Makefile.android |
| diff --git a/Makefile.android b/Makefile.android |
| index aeff01c665e1da1c9c6fc51daff0bb6c8f671bf6..40828ddc228feb0769a2af1340f2c3ae30a0cee6 100644 |
| --- a/Makefile.android |
| +++ b/Makefile.android |
| @@ -36,7 +36,9 @@ ANDROID_BUILDS = $(foreach mode,$(MODES), \ |
| HOST_OS = $(shell uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/') |
| ifeq ($(HOST_OS), linux) |
| - TOOLCHAIN_DIR = linux-x86 |
| + HOST_ARCH = $(shell uname -m | \ |
|
ulan
2013/07/16 09:04:14
This doesn't work with previous versions of Androi
rmcilroy
2013/07/16 16:44:28
How about this? It defaults this variable based o
|
| + sed -e 's/i386/x86/;s/i486/x86/;s/i586/x86/;s/i686/x86/;') |
| + TOOLCHAIN_DIR = linux-$(HOST_ARCH) |
| else |
| ifeq ($(HOST_OS), mac) |
| TOOLCHAIN_DIR = darwin-x86 |