diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-18 13:04:56 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-03-18 13:04:56 -0700 |
| commit | d1393ff90e4998cf3b1c4c32a51e8d64f0172fbd (patch) | |
| tree | 6a390814edce9ce6dee9afd5bad69919233baf7a | |
| parent | 7cc936c4a3bc05fdeed950b4094b999eaf6b8cd8 (diff) | |
| parent | 10ae9cca245a658b6588f7603dffaabdd1fbfe3f (diff) | |
| download | platform_sdk-d1393ff90e4998cf3b1c4c32a51e8d64f0172fbd.tar.gz platform_sdk-d1393ff90e4998cf3b1c4c32a51e8d64f0172fbd.tar.bz2 platform_sdk-d1393ff90e4998cf3b1c4c32a51e8d64f0172fbd.zip | |
Merge "Merge ec970d641caedee9656ef8fcc7cdd60e6812b75d into tools_r10. do not merge." into tools_r10
| -rw-r--r-- | emulator/gps/Android.mk | 9 | ||||
| -rw-r--r-- | emulator/qemud/Android.mk | 9 | ||||
| -rw-r--r-- | emulator/sensors/Android.mk | 9 | ||||
| -rw-r--r-- | emulator/tools/Android.mk | 8 |
4 files changed, 35 insertions, 0 deletions
diff --git a/emulator/gps/Android.mk b/emulator/gps/Android.mk index 77b2de5cb..41bdc6440 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 a186c73de..5666a74a1 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 74e02adb6..9b0e83d86 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 c9d961342..1bdbf684a 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 |