diff options
| author | Ying Wang <wangying@google.com> | 2014-02-19 18:25:55 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-02-19 18:25:55 -0800 |
| commit | 3da7b96a390f4204e31420c42e65397f90424d24 (patch) | |
| tree | 3fa756a558293afbbb162fdff45a91fac4738bc2 /core/dumpvar.mk | |
| parent | 5aa50c6637f88213661b29facaf05f072316dec0 (diff) | |
| download | build-3da7b96a390f4204e31420c42e65397f90424d24.zip build-3da7b96a390f4204e31420c42e65397f90424d24.tar.gz build-3da7b96a390f4204e31420c42e65397f90424d24.tar.bz2 | |
Remove dead code.
It seems the code was meant to add the toolchain to ANDROID_BUILD_PATHS
and then export to PATH by lunch.
But now we export the toolchain to PATH explicitly in envsetup.sh and
the code is unnecessary.
This reduces the places to change when we upgrade the gcc version.
It also fixed the bug that the mips toolchain was always exported
regardless of the target arch.
Change-Id: Iee3b895b4c4e0df8971c27c01b9ecbd591848b12
Diffstat (limited to 'core/dumpvar.mk')
| -rw-r--r-- | core/dumpvar.mk | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/core/dumpvar.mk b/core/dumpvar.mk index 2612e06..7af0a0c 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -9,31 +9,6 @@ else ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) endif -# Add the ARM toolchain bin dir if it actually exists -ifeq ($(TARGET_ARCH),arm) - ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION)/bin),) - # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-$(TARGET_GCC_VERSION)/bin - endif - ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-eabi-$(TARGET_GCC_VERSION)/bin),) - # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-eabi-$(TARGET_GCC_VERSION)/bin - endif -else ifeq ($(TARGET_ARCH),x86) - -# Add the x86 toolchain bin dir if it actually exists - ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$(TARGET_GCC_VERSION)/bin),) - # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$(TARGET_GCC_VERSION)/bin - endif -endif - -# Add the mips toolchain bin dir if it actually exists -ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-$(TARGET_GCC_VERSION)/bin),) - # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-$(TARGET_GCC_VERSION)/bin -endif - ANDROID_BUILD_PATHS := $(ABP) ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG) ANDROID_GCC_PREBUILTS := prebuilts/gcc/$(HOST_PREBUILT_TAG) |