tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp

Browse source 
Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07
This commit is contained in:
Jean-Baptiste Queru 2012-05-16 13:18:39 -07:00
commit feec98b139
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/combo/TARGET_linux-x86.mk
View file

@ -36,8 +36,8 @@ include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)
TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-android-linux-4.4.3 TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6
TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/i686-android-linux- TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/i686-linux-android-
endif endif
TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)

4
core/dumpvar.mk
View file

@ -16,9 +16,9 @@ ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androi
endif endif
# Add the x86 toolchain bin dir if it actually exists # 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),) ifneq ($(wildcard $(PWD)/prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/i686-linux-android-4.6/bin),)
# this should be copied to HOST_OUT_EXECUTABLES instead # 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-linux-android-4.6/bin
endif endif
ANDROID_BUILD_PATHS := $(ABP) ANDROID_BUILD_PATHS := $(ABP)
ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG) ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)

8
core/llvm_config.mk
View file

@ -41,12 +41,12 @@ ifeq ($(TARGET_ARCH),arm)
endif endif
ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
CLANG_CONFIG_EXTRA_CFLAGS += \ CLANG_CONFIG_EXTRA_CFLAGS += \
-target i686-android-linux \ -target i686-linux-android \
-nostdlibinc \ -nostdlibinc \
-B$(TARGET_TOOLCHAIN_ROOT)/i686-android-linux/bin -B$(TARGET_TOOLCHAIN_ROOT)/i686-linux-android/bin
CLANG_CONFIG_EXTRA_LDFLAGS += \ CLANG_CONFIG_EXTRA_LDFLAGS += \
-target i686-android-linux \ -target i686-linux-android \
-B$(TARGET_TOOLCHAIN_ROOT)/i686-android-linux/bin -B$(TARGET_TOOLCHAIN_ROOT)/i686-linux-android/bin
CLANG_CONFIG_UNKNOWN_CFLAGS += \ CLANG_CONFIG_UNKNOWN_CFLAGS += \
-finline-limit=300 \ -finline-limit=300 \
-fno-inline-functions-called-once \ -fno-inline-functions-called-once \

4
envsetup.sh
View file

@ -118,7 +118,7 @@ function setpaths()
export ANDROID_EABI_TOOLCHAIN= export ANDROID_EABI_TOOLCHAIN=
local ARCH=$(get_build_var TARGET_ARCH) local ARCH=$(get_build_var TARGET_ARCH)
case $ARCH in case $ARCH in
x86) toolchaindir=x86/i686-android-linux-4.4.3/bin x86) toolchaindir=x86/i686-linux-android-4.6/bin
;; ;;
arm) toolchaindir=arm/arm-linux-androideabi-4.6/bin arm) toolchaindir=arm/arm-linux-androideabi-4.6/bin
;; ;;
@ -737,7 +737,7 @@ function gdbclient()
local ARCH=$(get_build_var TARGET_ARCH) local ARCH=$(get_build_var TARGET_ARCH)
local GDB local GDB
case "$ARCH" in case "$ARCH" in
x86) GDB=i686-android-linux-gdb;; x86) GDB=i686-linux-android-gdb;;
arm) GDB=arm-linux-androideabi-gdb;; arm) GDB=arm-linux-androideabi-gdb;;
*) echo "Unknown arch $ARCH"; return 1;; *) echo "Unknown arch $ARCH"; return 1;;
esac esac