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

Commit 732936d9 authored by Raphael's avatar Raphael
Browse files

resolved conflicts for merge of 8508a073 to honeycomb-plus-aosp 

Change-Id: I376928881adb0e9fd62fabc1e21542bf0d700ca2
parents de50d0ab 8508a073

core/combo/TARGET_linux-arm.mk

+11 −7
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ TARGET_TOOLS_PREFIX := \ 
	prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin/arm-linux-androideabi-

endif



# Only define these if there's actually a gcc in there.

# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.

ifneq ($(wildcard $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)),)

    TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)

    TARGET_CXX := $(TARGET_TOOLS_PREFIX)g++$(HOST_EXECUTABLE_SUFFIX)

    TARGET_AR := $(TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX)
@@ -54,6 +57,7 @@ TARGET_OBJCOPY := $(TARGET_TOOLS_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX) 
    TARGET_LD := $(TARGET_TOOLS_PREFIX)ld$(HOST_EXECUTABLE_SUFFIX)

    TARGET_STRIP := $(HOST_OUT_EXECUTABLES)/soslim$(HOST_EXECUTABLE_SUFFIX)

    TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip --shady --quiet $< --outfile $@

endif



TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined

core/dumpvar.mk

+5 −2
Original line number Diff line number Diff line
@@ -8,9 +8,12 @@ ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) 
ifeq ($(TARGET_SIMULATOR),true)

	ABP:=$(ABP):$(TARGET_OUT_EXECUTABLES)

else

	# Add the toolchain bin dir if it actually exists

	ifneq ($(wildcard $(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/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

	endif

endif

ANDROID_BUILD_PATHS := $(ABP)

ANDROID_PREBUILTS := prebuilt/$(HOST_PREBUILT_TAG)

envsetup.sh

+19 −4
Original line number Diff line number Diff line
@@ -95,19 +95,34 @@ function setpaths() 
    #                                                                #

    ##################################################################



    # Note: on windows/cygwin, ANDROID_BUILD_PATHS will contain spaces

    # due to "C:\Program Files" being in the path.



    # out with the old

    if [ -n $ANDROID_BUILD_PATHS ] ; then

    if [ -n "$ANDROID_BUILD_PATHS" ] ; then

        export PATH=${PATH/$ANDROID_BUILD_PATHS/}

    fi

    if [ -n $ANDROID_PRE_BUILD_PATHS ] ; then

    if [ -n "$ANDROID_PRE_BUILD_PATHS" ] ; then

        export PATH=${PATH/$ANDROID_PRE_BUILD_PATHS/}

    fi



    # and in with the new

    CODE_REVIEWS=

    prebuiltdir=$(getprebuilt)

    export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-linux-androideabi-4.4.x/bin

    export ARM_EABI_TOOLCHAIN=$prebuiltdir/toolchain/arm-eabi-4.4.3/bin



    # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.

    export ANDROID_EABI_TOOLCHAIN=

    toolchaindir=toolchain/arm-linux-androideabi-4.4.x/bin

    if [ -d "$prebuiltdir/$toolchaindir" ]; then

        export ANDROID_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir

    fi



    export ARM_EABI_TOOLCHAIN=

    toolchaindir=toolchain/arm-eabi-4.4.3/bin

    if [ -d "$prebuiltdir/$toolchaindir" ]; then

        export ARM_EABI_TOOLCHAIN=$prebuiltdir/$toolchaindir

    fi



    export ANDROID_TOOLCHAIN=$ANDROID_EABI_TOOLCHAIN

    export ANDROID_QTOOLS=$T/development/emulator/qtools

    export ANDROID_BUILD_PATHS=:$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ARM_EABI_TOOLCHAIN$CODE_REVIEWS