diff options
| author | Jing Yu <jingyu@google.com> | 2012-03-29 20:45:50 -0700 |
|---|---|---|
| committer | Jing Yu <jingyu@google.com> | 2012-03-29 20:45:50 -0700 |
| commit | f5172c7564e0d84bf02b9add47809ce10a9cff4f (patch) | |
| tree | 3e76de9743b59a989483413dd8796af1aa2a4cf2 /core/dumpvar.mk | |
| parent | 971c246cb543b0021f78d52333bcbbe00ca106d8 (diff) | |
| download | build-f5172c7564e0d84bf02b9add47809ce10a9cff4f.zip build-f5172c7564e0d84bf02b9add47809ce10a9cff4f.tar.gz build-f5172c7564e0d84bf02b9add47809ce10a9cff4f.tar.bz2 | |
Switch default gcc toolchain from 4.4.3 to 4.6.
Switch both arm-linux-androideabi toolchainand arm-eabi toolchain.
Change-Id: I7b2771fe684853ab37e3b5b7cfe4146f9f901e02
Diffstat (limited to 'core/dumpvar.mk')
| -rw-r--r-- | core/dumpvar.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 87f7086..0f7dd8f 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -10,18 +10,19 @@ 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 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)/prebuilts/gcc//$(HOST_PREBUILT_TAG)/x86/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) +ANDROID_GCC_PREBUILTS := prebuilts/gcc/$(HOST_PREBUILT_TAG) # The "dumpvar" stuff lets you say something like # |