Symlink to old QEMU binary

Author: gsingh93

Makefile

@@ -499,8 +499,9 @@ QEMU_DTS := $(OUT_DIR)/qemu.dts
 .PHONY: android-dtb
 android-dtb $(ANDROID_DTB):
 ifneq ($(ARCH),arm64)
-   $(error android-dtb is only supported from arm64)
+    $(error android-dtb is only supported from arm64)
 endif
+
 	QEMU_EXTRA_ARGS="-M dumpdtb=$(QEMU_DTB)" $(MAKE) run
 	$(DTC) -I dtb -O dts $(QEMU_DTB) > $(QEMU_DTS)
 	cat $(QEMU_DTS) $(ATF_DIR)/firmware.android.dts > $(ANDROID_DTS)
@@ -606,7 +607,6 @@ else ifeq ($(ARCH),i386)
 else
   ifeq ($(TRUSTY),1)
     # Trusty needs to use its own build of QEMU which has some custom patches
-    # QEMU_BIN ?= $(TRUSTY_OUT)/qemu-build/qemu-system-aarch64
     QEMU_BIN ?= $(TRUSTY_OUT)/qemu-build/aarch64-softmmu/qemu-system-aarch64
   else
     QEMU_BIN ?= qemu-system-aarch64

config/trusty/qemu-qemu-inc.mk

@@ -57,6 +57,7 @@ QEMU_EXTRA_CFLAGS := \
 # Newer capstone releases have the headers under include/capstone
 QEMU_EXTRA_CFLAGS += -I$(TRUSTY_TOP)/$(QEMU_ROOT)/capstone/include/capstone
 
+$(QEMU_MAKEFILE): QEMU_ARCH:=$(QEMU_ARCH)
 $(QEMU_MAKEFILE): QEMU_ROOT:=$(QEMU_ROOT)
 $(QEMU_MAKEFILE): QEMU_BUILD_BASE:=$(QEMU_BUILD_BASE)
 $(QEMU_MAKEFILE): QEMU_TARGET:=$(QEMU_TARGET)
@@ -71,6 +72,9 @@ $(QEMU_MAKEFILE):
 		--disable-gcrypt $(QEMU_AOSP_DISABLES) \
 		--enable-slirp
 
+	# Symlink to the old QEMU path so we can always find it at the same place
+	ln -s $(QEMU_BUILD_BASE)/qemu-system-$(QEMU_ARCH) $(QEMU_BIN)
+
 $(QEMU_BIN): QEMU_BUILD_BASE:=$(QEMU_BUILD_BASE)
 $(QEMU_BIN): $(QEMU_MAKEFILE) .PHONY
 	$(MAKE) -C $(QEMU_BUILD_BASE)