Fix tools_r10: some emulator files moved to development.git

Original msg:
---
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.

(cherry picked from commit ec970d641caedee9656ef8fcc7cdd60e6812b75d)

Change-Id: I79c2af1da7d27cb8b75ab366e37524e1a929426f

4 files changed, 35 insertions, 0 deletions

diff --git a/emulator/gps/Android.mk b/emulator/gps/Android.mk
index 77b2de5..41bdc64 100644
--- a/emulator/gps/Android.mk
+++ b/emulator/gps/Android.mk
@@ -13,6 +13,13 @@
 # limitations under the License.
 
 
+# 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_GPS_MODULE
+BUILD_EMULATOR_GPS_MODULE := true
+
 LOCAL_PATH := $(call my-dir)
 
 ifneq ($(TARGET_PRODUCT),sim)
@@ -28,3 +35,5 @@ LOCAL_MODULE := gps.goldfish
 LOCAL_MODULE_TAGS := debug
 include $(BUILD_SHARED_LIBRARY)
 endif
+
+endif # BUILD_EMULATOR_GPS_MODULE
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
diff --git a/emulator/sensors/Android.mk b/emulator/sensors/Android.mk
index 74e02ad..9b0e83d 100644
--- a/emulator/sensors/Android.mk
+++ b/emulator/sensors/Android.mk
@@ -13,6 +13,13 @@
 # limitations under the License.
 
 
+# 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_SENSORS_MODULE
+BUILD_EMULATOR_SENSORS_MODULE := true
+
 LOCAL_PATH := $(call my-dir)
 
 ifneq ($(TARGET_PRODUCT),sim)
@@ -27,3 +34,5 @@ LOCAL_MODULE := sensors.goldfish
 LOCAL_MODULE_TAGS := debug
 include $(BUILD_SHARED_LIBRARY)
 endif
+
+endif # BUILD_EMULATOR_SENSORS_MODULE
diff --git a/emulator/tools/Android.mk b/emulator/tools/Android.mk
index c9d9613..1bdbf68 100644
--- a/emulator/tools/Android.mk
+++ b/emulator/tools/Android.mk
@@ -16,6 +16,13 @@
 # that should only run in the emulator.
 #
 
+# 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_QEMU_PROPS
+BUILD_EMULATOR_QEMU_PROPS := true
+
 LOCAL_PATH := $(call my-dir)
 
 ifneq ($(TARGET_PRODUCT),sim)
@@ -34,3 +41,4 @@ include $(BUILD_EXECUTABLE)
 
 endif # TARGET_PRODUCT != sim
 
+endif # BUILD_EMULATOR_QEMU_PROPS