diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-09 13:02:03 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-09 13:02:03 -0800 |
| commit | ea91f0a40ee114588204b9912345d3d8305ee190 (patch) | |
| tree | 4f1ce5b4cb2dc186bbe73705006213660cb6232e /core | |
| parent | 71b5cc1b8e5b917be7281849c62551f776e87772 (diff) | |
| download | build-ea91f0a40ee114588204b9912345d3d8305ee190.zip build-ea91f0a40ee114588204b9912345d3d8305ee190.tar.gz build-ea91f0a40ee114588204b9912345d3d8305ee190.tar.bz2 | |
Reference x86 toolchain in its new location
Change-Id: I990b03107d1596a87a8d4cea6973735c60db4c64
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 2 | ||||
| -rw-r--r-- | core/dumpvar.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index c27fbb6..9e1d4bd 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -36,7 +36,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) -TARGET_TOOLCHAIN_ROOT := prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3 +TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-android-linux-4.4.3 TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/i686-android-linux- endif diff --git a/core/dumpvar.mk b/core/dumpvar.mk index c3d6b5f..cd65fa3 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -16,9 +16,9 @@ ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androi endif # Add the x86 toolchain bin dir if it actually exists -ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin),) +ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-android-linux-4.4.3/bin),) # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin + ABP:=$(ABP):$(PWD)/prebuilts/gcc//$(HOST_PREBUILT_TAG)/x86/i686-android-linux-4.4.3/bin endif ANDROID_BUILD_PATHS := $(ABP) ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG) |