From 2d238fd9871687b1557f15b8878a6cf3e9634b57 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Fri, 25 Mar 2011 10:34:47 +0100 Subject: Add 'emulator' launcher program. This patch renames the current ARM-specific emulator binary to 'emulator-arm' and introduces a new tiny (less than 20KB) 'emulator' launcher program. The role of 'emulator' is to launch either 'emulator-arm' or 'emulator-x86' based on the target AVD or platform build being used. This program will be replaced in the future by what is currently known as 'emulator-ui', but is a good placeholder until this work is completed. + Move some utility functions from android/avd/info.[hc] to android/avd/util.[hc] so that 'emulator' can use them directly. IMPORTANT: For platform builds, the target architecture is detected automatically by parsing the build.prop file. For SDK AVDs however, there is no easy way to determine the target architecture, so the patch adds a new hw.cpu.arch property which can have value 'arm' or 'x86' Change-Id: I0084c196695a75c8b9230ba716b3cd2e12610ded --- Makefile.target | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Makefile.target') diff --git a/Makefile.target b/Makefile.target index 77f08c3..8006c8d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -289,12 +289,7 @@ $(call end-emulator-program) ### ### -# Special case, "emulator-arm" is named "emulator" for now. -ifeq ($(EMULATOR_TARGET_ARCH),arm) -$(call start-emulator-program, emulator) -else $(call start-emulator-program, emulator-$(EMULATOR_TARGET_ARCH)) -endif LOCAL_STATIC_LIBRARIES := \ emulator-libui \ -- cgit v1.1