am f983286e: am 6a447eef: Merge "Fix warning: overriding commands for target"

* commit 'f983286eedf71a6cef67ba6ba88c6ea0f19717f5':
  Fix warning: overriding commands for target
This commit is contained in:
Dmitriy Ivanov
2014-12-04 09:22:01 +00:00
committed by Android Git Automerger

View File

@@ -14,6 +14,10 @@
# limitations under the License.
#
# Include once
ifneq ($(bionic_run_on_host_mk_included),true)
bionic_run_on_host_mk_included:=true
ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm mips x86))
LINKER = linker64
else
@@ -37,3 +41,4 @@ bionic-prepare-run-on-host: $(TARGET_OUT_EXECUTABLES)/$(LINKER) $(TARGET_OUT)/et
ln -fs `realpath $(TARGET_OUT)/lib64` /system/; \
fi
endif
endif