aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/qemud
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-03-11 15:59:18 +0100
committerDavid 'Digit' Turner <digit@android.com>2011-03-11 16:35:25 +0100
commitec970d641caedee9656ef8fcc7cdd60e6812b75d (patch)
tree34126deaea6c3ef7ad600b4434a3f8f9ca5ab107 /emulator/qemud
parentd4a227a2f58801fafd60a9721e992aa158b93c05 (diff)
downloadsdk-ec970d641caedee9656ef8fcc7cdd60e6812b75d.zip
sdk-ec970d641caedee9656ef8fcc7cdd60e6812b75d.tar.gz
sdk-ec970d641caedee9656ef8fcc7cdd60e6812b75d.tar.bz2
Prepare for moving platform-specific emulator modules to development.git
We need to move the platform-specific modules to development.git to avoid some clashes. This patch uses a guard Make variable to ensure that each module is only built once. The plan is to simply copy these modules to development.git, then remove the current ones from sdk.git. The guard variable is here to ensure that the transition happens smoothly, i.e. if a build contains modules in both directories, only one of them will be built. Change-Id: I4bc58741a18488f18a4b17e8a1edc4a4a5a93cbc
Diffstat (limited to 'emulator/qemud')
-rw-r--r--emulator/qemud/Android.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/emulator/qemud/Android.mk b/emulator/qemud/Android.mk
index a186c73..5666a74 100644
--- a/emulator/qemud/Android.mk
+++ b/emulator/qemud/Android.mk
@@ -1,5 +1,12 @@
# Copyright 2008 The Android Open Source Project
+# We're moving the emulator-specific platform libs to
+# development.git/tools/emulator/. The following test is to ensure
+# smooth builds even if the tree contains both versions.
+#
+ifndef BUILD_EMULATOR_QEMUD
+BUILD_EMULATOR_QEMUD := true
+
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -14,3 +21,5 @@ LOCAL_MODULE:= qemud
LOCAL_MODULE_TAGS := debug
include $(BUILD_EXECUTABLE)
+
+endif # BUILD_EMULATOR_QEMUD \ No newline at end of file