From e01a5759b7e59f67c534c901e3ae7dcc8d14bd8a Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Fri, 22 Dec 2017 13:31:41 +0000 Subject: [PATCH] Revert "emulator: add check_emu_boot.mk" This reverts commit bba0ef24c22d75d677e452963a8b939438bc87b1. Reason for revert: Broke aosp_arm64_ab-userdebug build on internal master. Change-Id: I04ca552174bc2731cb69ee8485d50f4c190c0d27 --- core/tasks/check_emu_boot.mk | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 core/tasks/check_emu_boot.mk diff --git a/core/tasks/check_emu_boot.mk b/core/tasks/check_emu_boot.mk deleted file mode 100644 index f8daee08a..000000000 --- a/core/tasks/check_emu_boot.mk +++ /dev/null @@ -1,23 +0,0 @@ -check_emu_boot0 := $(DIST_DIR)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)-emulator-boot-test-result.txt -$(check_emu_boot0) : PRIVATE_PREFIX := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) -$(check_emu_boot0) : PRIVATE_EMULATOR_BOOT_TEST_SH := device/generic/goldfish/tools/emulator_boot_test.sh -$(check_emu_boot0) : PRIVATE_BOOT_COMPLETE_STRING := "emulator: INFO: boot completed" -$(check_emu_boot0) : PRIVATE_BOOT_FAIL_STRING := "emulator: ERROR: fail to boot after" -$(check_emu_boot0) : PRIVATE_SUCCESS_FILE := $(DIST_DIR)/$(PRIVATE_PREFIX)-BOOT-SUCCESS.txt -$(check_emu_boot0) : PRIVATE_FAIL_FILE := $(DIST_DIR)/$(PRIVATE_PREFIX)-BOOT-FAIL.txt -$(check_emu_boot0) : $(INSTALLED_QEMU_SYSTEMIMAGE) $(INSTALLED_QEMU_VENDORIMAGE) $(PRODUCT_OUT)/userdata.img \ - $(PRODUCT_OUT)/ramdisk.img device/generic/goldfish/tools/emulator_boot_test.sh - @mkdir -p $(dir $(check_emu_boot0)) - $(hide) rm -f $(check_emu_boot0) - $(hide) rm -f $(PRIVATE_SUCCESS_FILE) - $(hide) rm -f $(PRIVATE_FAIL_FILE) - (export ANDROID_PRODUCT_OUT=$$(cd $(PRODUCT_OUT);pwd);\ - export ANDROID_BUILD_TOP=$$(pwd);\ - $(PRIVATE_EMULATOR_BOOT_TEST_SH) > $(check_emu_boot0)) - (if grep -q $(PRIVATE_BOOT_COMPLETE_STRING) $(check_emu_boot0);\ - then echo boot_succeeded > $(PRIVATE_SUCCESS_FILE); fi) - (if grep -q $(PRIVATE_BOOT_FAIL_STRING) $(check_emu_boot0);\ - then echo boot_failed > $(PRIVATE_FAIL_FILE); fi) -.PHONY: check_emu_boot -check_emu_boot: $(check_emu_boot0) -