am e45c8607
: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit 'e45c8607b3e2cf7a428a91898aea2752a54389a1': set a prebuilt directory name for the 2nd arch add vendor directories to gdb shared library search path add 2nd arch gcc to the path fix paths when 2nd arch gcc is a different version
This commit is contained in:
@@ -579,6 +579,9 @@ INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/publi
|
||||
# This is the standard way to name a directory containing prebuilt target
|
||||
# objects. E.g., prebuilt/$(TARGET_PREBUILT_TAG)/libc.so
|
||||
TARGET_PREBUILT_TAG := android-$(TARGET_ARCH)
|
||||
ifdef TARGET_2ND_ARCH
|
||||
TARGET_2ND_PREBUILT_TAG := android-$(TARGET_2ND_ARCH)
|
||||
endif
|
||||
|
||||
# Set up RS prebuilt variables for compatibility library
|
||||
|
||||
|
@@ -120,6 +120,7 @@ function setpaths()
|
||||
|
||||
# defined in core/config.mk
|
||||
targetgccversion=$(get_build_var TARGET_GCC_VERSION)
|
||||
targetgccversion2=$(get_build_var 2ND_TARGET_GCC_VERSION)
|
||||
export TARGET_GCC_VERSION=$targetgccversion
|
||||
|
||||
# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
|
||||
@@ -134,7 +135,7 @@ function setpaths()
|
||||
arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin
|
||||
;;
|
||||
arm64) toolchaindir=aarch64/aarch64-linux-android-$targetgccversion/bin;
|
||||
toolchaindir2=arm/arm-linux-androideabi-$targetgccversion/bin
|
||||
toolchaindir2=arm/arm-linux-androideabi-$targetgccversion2/bin
|
||||
;;
|
||||
mips) toolchaindir=mips/mipsel-linux-android-$targetgccversion/bin
|
||||
;;
|
||||
@@ -170,7 +171,7 @@ function setpaths()
|
||||
|
||||
export ANDROID_QTOOLS=$T/development/emulator/qtools
|
||||
export ANDROID_DEV_SCRIPTS=$T/development/scripts:$T/prebuilts/devtools/tools
|
||||
export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_KERNEL_TOOLCHAIN_PATH$ANDROID_DEV_SCRIPTS:
|
||||
export ANDROID_BUILD_PATHS=$(get_build_var ANDROID_BUILD_PATHS):$ANDROID_QTOOLS:$ANDROID_TOOLCHAIN:$ANDROID_TOOLCHAIN_2ND_ARCH:$ANDROID_KERNEL_TOOLCHAIN_PATH$ANDROID_DEV_SCRIPTS:
|
||||
|
||||
# If prebuilts/android-emulator/<system>/ exists, prepend it to our PATH
|
||||
# to ensure that the corresponding 'emulator' binaries are used.
|
||||
@@ -976,6 +977,7 @@ function gdbclient()
|
||||
local OUT_ROOT=$(get_abs_build_var PRODUCT_OUT)
|
||||
local OUT_SYMBOLS=$(get_abs_build_var TARGET_OUT_UNSTRIPPED)
|
||||
local OUT_SO_SYMBOLS=$(get_abs_build_var TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)
|
||||
local OUT_VENDOR_SO_SYMBOLS=$(get_abs_build_var TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED)
|
||||
local OUT_EXE_SYMBOLS=$(get_abs_build_var TARGET_OUT_EXECUTABLES_UNSTRIPPED)
|
||||
local PREBUILTS=$(get_abs_build_var ANDROID_PREBUILTS)
|
||||
local ARCH=$(get_build_var TARGET_ARCH)
|
||||
@@ -1040,7 +1042,7 @@ function gdbclient()
|
||||
OUT_SO_SYMBOLS=$OUT_SO_SYMBOLS$USE64BIT
|
||||
|
||||
echo >|"$OUT_ROOT/gdbclient.cmds" "set solib-absolute-prefix $OUT_SYMBOLS"
|
||||
echo >>"$OUT_ROOT/gdbclient.cmds" "set solib-search-path $OUT_SO_SYMBOLS:$OUT_SO_SYMBOLS/hw:$OUT_SO_SYMBOLS/ssl/engines:$OUT_SO_SYMBOLS/drm:$OUT_SO_SYMBOLS/egl:$OUT_SO_SYMBOLS/soundfx"
|
||||
echo >>"$OUT_ROOT/gdbclient.cmds" "set solib-search-path $OUT_SO_SYMBOLS:$OUT_SO_SYMBOLS/hw:$OUT_SO_SYMBOLS/ssl/engines:$OUT_SO_SYMBOLS/drm:$OUT_SO_SYMBOLS/egl:$OUT_SO_SYMBOLS/soundfx:$OUT_VENDOR_SO_SYMBOLS:$OUT_VENDOR_SO_SYMBOLS/hw:$OUT_VENDOR_SO_SYMBOLS/egl"
|
||||
echo >>"$OUT_ROOT/gdbclient.cmds" "source $ANDROID_BUILD_TOP/development/scripts/gdb/dalvik.gdb"
|
||||
echo >>"$OUT_ROOT/gdbclient.cmds" "target remote $PORT"
|
||||
echo >>"$OUT_ROOT/gdbclient.cmds" ""
|
||||
|
Reference in New Issue
Block a user