aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/app/Android.mk
diff options
context:
space:
mode:
authorJohnnie Birch <johnnie.l.birch.jr@intel.com>2011-02-03 18:56:59 -0800
committerJohnnie Birch <johnnie.l.birch.jr@intel.com>2011-03-01 11:08:33 -0800
commit38b72b64c1c066658266e07fdb1ea0717025183b (patch)
tree982ebeb8216ee816cff3c2556f964ef6c7f1b60b /sdkmanager/app/Android.mk
parent2695266bdddb8d827ea682a7e310e19919a73826 (diff)
downloadsdk-38b72b64c1c066658266e07fdb1ea0717025183b.zip
sdk-38b72b64c1c066658266e07fdb1ea0717025183b.tar.gz
sdk-38b72b64c1c066658266e07fdb1ea0717025183b.tar.bz2
AVD and ADT eclipse plugin to support processor-specific platform images and emulators.
This is a first (and largest) patch in a series of patches over the next month to extend the AVD and ADT eclipse plugin to support processor-specific platform images and emulators. This patch is intended to co-exist with patches to create x86 emulator environments and overall SDK support. There is an overall expectation that the sdk building process will be updated to meet the following expectations... It is not in the scope of these UI patches to change the overall sdk building structure. expectation #1: tools/emulator[.exe] -- ARM tools/emulator-x86[.exe] -- x86 tools/emulator-foo[.exe] -- an arbitrary additional architecture (extensible) expectation #2: platforms/android-XXX/images/arm - location of kernel/images for ARM platforms/android-XXX/images/x86 - location of kernel/images for x86 platforms/android-XXX/images/foo - location of kernel/images for arbitrary architecture expectation #3 In the event that add-ons are in the SDK, add-ons/addon_XXX/images/arm - location of kernel/images for ARM add-ons/addon_XXX/images/x86 - location of kernel/images for x86 add-ons/addon_XXX/images/foo - location of kernel/images for arbitrary architecture NOTE: For "earlier"/legacy api levels, it is assumed that it is ARM only and the images will be in platforms/android-XXX/images and add-ons/addon_XXX/images When an API level is chosen in AVD, it scans the appropriate API directories and determines if the image directory is "legacy" or if it has subdirectories. In the latter case, it populates the list of potential processors using these directory names (and some prettyprinting for well known architectures) tested using "android" command line to start AVD on linux and windows tested using Eclipse plugin AVD integration on linux and windows REMINDER: You need to change the directory layout of images and add the right emulator-XXX[.exe] to test it If one uses the "android" command line to create an AVD from the command line, the processor type is assumed to be arm today. A future patch will be needed to add command line processor type selectivity Change-Id: Ifd7c39bf93c6e926f62407bfed024d2789efb41a
Diffstat (limited to 'sdkmanager/app/Android.mk')
-rw-r--r--sdkmanager/app/Android.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/sdkmanager/app/Android.mk b/sdkmanager/app/Android.mk
index 24ba61f..87e830d 100644
--- a/sdkmanager/app/Android.mk
+++ b/sdkmanager/app/Android.mk
@@ -1,5 +1,6 @@
# Copyright 2007 The Android Open Source Project
#
SDKMANAGERAPP_LOCAL_DIR := $(call my-dir)
-include $(SDKMANAGERAPP_LOCAL_DIR)/etc/Android.mk
-include $(SDKMANAGERAPP_LOCAL_DIR)/src/Android.mk
+
+# Build all sub-directories
+include $(call all-makefiles-under,$(SDKMANAGERAPP_LOCAL_DIR))