Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea91f0a4 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Reference x86 toolchain in its new location 

Change-Id: I990b03107d1596a87a8d4cea6973735c60db4c64
parent 71b5cc1b

core/combo/TARGET_linux-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE) 


# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else

ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)

TARGET_TOOLCHAIN_ROOT := prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3

TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-android-linux-4.4.3

TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/i686-android-linux-

endif

core/dumpvar.mk

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androi 
endif



# Add the x86 toolchain bin dir if it actually exists

ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/i686-android-linux-4.4.3/bin),)

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)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/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)