diff options
| author | Colin Cross <ccross@android.com> | 2014-05-22 19:36:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 19:36:15 +0000 |
| commit | 423242b59ea01dffbb7f79c7c045528f7c351c4b (patch) | |
| tree | d12256f719542c2a42c3e6233347eeec0ec953b3 /core/config.mk | |
| parent | 716176059ab8962c7049f91c83c82b1af9f2632a (diff) | |
| parent | 828b518377f69516ea6cbb9ad160d81ced6980d5 (diff) | |
| download | build-423242b59ea01dffbb7f79c7c045528f7c351c4b.zip build-423242b59ea01dffbb7f79c7c045528f7c351c4b.tar.gz build-423242b59ea01dffbb7f79c7c045528f7c351c4b.tar.bz2 | |
am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '828b518377f69516ea6cbb9ad160d81ced6980d5':
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
Diffstat (limited to 'core/config.mk')
| -rw-r--r-- | core/config.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/config.mk b/core/config.mk index 487bc69..7e86126 100644 --- a/core/config.mk +++ b/core/config.mk @@ -582,6 +582,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 |