diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-11 04:23:06 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-11 04:23:06 -0800 |
| commit | cb8f66305caf4f9252112608ad93e2ef58321244 (patch) | |
| tree | 39e50f8e1a5ec7a46da2d88074f0b317c3b79a85 /core/dumpvar.mk | |
| parent | dfd93fc209a0fec27bf92b8e139ea25f46e0f514 (diff) | |
| download | build-cb8f66305caf4f9252112608ad93e2ef58321244.zip build-cb8f66305caf4f9252112608ad93e2ef58321244.tar.gz build-cb8f66305caf4f9252112608ad93e2ef58321244.tar.bz2 | |
Revert "Point arm toolchain to the new gcc-4.6 one."
This reverts commit 1f87795eef3ab5f63675dc6e01f304d1a6e46d2a.
Diffstat (limited to 'core/dumpvar.mk')
| -rw-r--r-- | core/dumpvar.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/dumpvar.mk b/core/dumpvar.mk index cd65fa3..23b28eb 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)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin),) +ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin),) # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin + ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin endif # Add the x86 toolchain bin dir if it actually exists @@ -22,7 +22,6 @@ ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-android-lin 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 # |