* commit '35b24a8234baa93d23a9ea029b8e8e675b134f7d': x86: cleanups for toolchain
This commit is contained in:
committed by
Android Git Automerger
commit
b0cc9aae50
@@ -10,15 +10,18 @@ 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),)
|
||||
# this should be copied to HOST_OUT_EXECUTABLES instead
|
||||
ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/bin
|
||||
endif
|
||||
ifeq ($(TARGET_ARCH),arm)
|
||||
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)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-4.6/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/i686-linux-android-4.6/bin),)
|
||||
# this should be copied to HOST_OUT_EXECUTABLES instead
|
||||
ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin
|
||||
ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin),)
|
||||
# this should be copied to HOST_OUT_EXECUTABLES instead
|
||||
ABP:=$(ABP):$(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin
|
||||
endif
|
||||
endif
|
||||
ANDROID_BUILD_PATHS := $(ABP)
|
||||
ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)
|
||||
|
Reference in New Issue
Block a user