Revert 776bd3e46c2fb5c003ecec4fee99f01943876644
Unfortunately, we need to keep duplicate libraries under sdk/emulator/
to avoid breaking a few internal branches.
commit 776bd3e46c2fb5c003ecec4fee99f01943876644
Author: David 'Digit' Turner <digit@android.com>
Date: Thu Apr 7 10:58:07 2011 +0200
emulator: Remove the global Make variable trick for emulator-specific system modules.
Remove a sad trick that was used to smoothly move the platform-specific emulator
modules from sdk/emulator/ to development/tools/emulator/system without creating
build conflicts.
Now that the sdk/ modules have been removed, we can get rid of the guard variable.
Change-Id: Id5c44a4160191d8ac9afcbbeeef7de0b9a5b0f6f
diff --git a/tools/emulator/system/gps/Android.mk b/tools/emulator/system/gps/Android.mk
index add551d..41bdc64 100644
--- a/tools/emulator/system/gps/Android.mk
+++ b/tools/emulator/system/gps/Android.mk
@@ -12,6 +12,14 @@
# See the License for the specific language governing permissions and
# 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)
@@ -27,3 +35,5 @@
LOCAL_MODULE_TAGS := debug
include $(BUILD_SHARED_LIBRARY)
endif
+
+endif # BUILD_EMULATOR_GPS_MODULE
diff --git a/tools/emulator/system/qemu-props/Android.mk b/tools/emulator/system/qemu-props/Android.mk
index dd15824..1bdbf68 100644
--- a/tools/emulator/system/qemu-props/Android.mk
+++ b/tools/emulator/system/qemu-props/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)
@@ -33,3 +40,5 @@
include $(BUILD_EXECUTABLE)
endif # TARGET_PRODUCT != sim
+
+endif # BUILD_EMULATOR_QEMU_PROPS
diff --git a/tools/emulator/system/qemud/Android.mk b/tools/emulator/system/qemud/Android.mk
index a186c73..5666a74 100644
--- a/tools/emulator/system/qemud/Android.mk
+++ b/tools/emulator/system/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_TAGS := debug
include $(BUILD_EXECUTABLE)
+
+endif # BUILD_EMULATOR_QEMUD
\ No newline at end of file
diff --git a/tools/emulator/system/sensors/Android.mk b/tools/emulator/system/sensors/Android.mk
index 7533f73..9b0e83d 100644
--- a/tools/emulator/system/sensors/Android.mk
+++ b/tools/emulator/system/sensors/Android.mk
@@ -12,6 +12,14 @@
# See the License for the specific language governing permissions and
# 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)
@@ -26,3 +34,5 @@
LOCAL_MODULE_TAGS := debug
include $(BUILD_SHARED_LIBRARY)
endif
+
+endif # BUILD_EMULATOR_SENSORS_MODULE
