diff options
| author | Raphael <raphael@google.com> | 2011-06-22 14:35:32 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2011-06-22 14:35:32 -0700 |
| commit | 732936d99a411e99c9a318506c778f8e8b23a17a (patch) | |
| tree | f9ac3a2cda73e0135364ac1214048322d84eef1c /core/dumpvar.mk | |
| parent | de50d0ab2008cbf836dc4fcbe9131a2071265946 (diff) | |
| parent | 8508a073523f02837c767d6c3d62ca8f623b1f40 (diff) | |
| download | build-732936d99a411e99c9a318506c778f8e8b23a17a.zip build-732936d99a411e99c9a318506c778f8e8b23a17a.tar.gz build-732936d99a411e99c9a318506c778f8e8b23a17a.tar.bz2 | |
resolved conflicts for merge of 8508a073 to honeycomb-plus-aosp
Change-Id: I376928881adb0e9fd62fabc1e21542bf0d700ca2
Diffstat (limited to 'core/dumpvar.mk')
| -rw-r--r-- | core/dumpvar.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/dumpvar.mk b/core/dumpvar.mk index c94d943..831ed97 100644 --- a/core/dumpvar.mk +++ b/core/dumpvar.mk @@ -8,8 +8,11 @@ ABP:=$(PWD)/$(HOST_OUT_EXECUTABLES) ifeq ($(TARGET_SIMULATOR),true) ABP:=$(ABP):$(TARGET_OUT_EXECUTABLES) else - # this should be copied to HOST_OUT_EXECUTABLES instead - ABP:=$(ABP):$(PWD)/prebuilt/$(HOST_PREBUILT_TAG)/toolchain/arm-linux-androideabi-4.4.x/bin + # 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) |