diff options
| author | Jing Yu <jingyu@google.com> | 2012-01-06 14:14:06 -0800 |
|---|---|---|
| committer | Jing Yu <jingyu@google.com> | 2012-01-06 14:14:06 -0800 |
| commit | 1f87795eef3ab5f63675dc6e01f304d1a6e46d2a (patch) | |
| tree | d0c84439a6281d278d86f51e9e04e9132dfd7f1f /core/dumpvar.mk | |
| parent | c7a10ddd3115a40de10b34d7dbfe92134ce7ae8f (diff) | |
| download | build-1f87795eef3ab5f63675dc6e01f304d1a6e46d2a.zip build-1f87795eef3ab5f63675dc6e01f304d1a6e46d2a.tar.gz build-1f87795eef3ab5f63675dc6e01f304d1a6e46d2a.tar.bz2 | |
Point arm toolchain to the new gcc-4.6 one.
Tested build mysid-eng, sojus-eng, trygon-eng, yakju-eng.
Change-Id: I742cf9fcf2407b9098c99136d67161ecf062ac01
Conflicts:
core/combo/TARGET_linux-arm.mk
Diffstat (limited to 'core/dumpvar.mk')
| -rw-r--r-- | core/dumpvar.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/dumpvar.mk b/core/dumpvar.mk index f91c08a..c3d6b5f 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -10,9 +10,9 @@ ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) endif # Add the ARM toolchain bin dir if it actually exists -ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),) +ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin),) # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin + ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin endif # Add the x86 toolchain bin dir if it actually exists @@ -22,6 +22,7 @@ ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-li endif ANDROID_BUILD_PATHS := $(ABP) ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG) +ANDROID_GCC_PREBUILTS := prebuilts/gcc/$(HOST_PREBUILT_TAG) # The "dumpvar" stuff lets you say something like # |