aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/tools/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'emulator/tools/Android.mk')
-rw-r--r--emulator/tools/Android.mk8
1 files changed, 8 insertions, 0 deletions
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