From ec970d641caedee9656ef8fcc7cdd60e6812b75d Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Fri, 11 Mar 2011 15:59:18 +0100 Subject: 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 --- emulator/sensors/Android.mk | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'emulator/sensors/Android.mk') 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 -- cgit v1.1