From 9bdeb24279a840dc75379b76828e6904f7edcd79 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Thu, 14 Apr 2011 14:13:44 +0200 Subject: Revert 183675b74e5a58211e5d9a90a9ca86546ed3e245 Unfortunately, we need to keep the duplicate libraries here to prevent breaking a few internal branches for now. Remove obsolete emulator modules The corresponding modules have all been moved to development/tools/emulator/system/ already. Note that we use a global variable Make trick to prevent the same module from being built twice, so removing these files doesn't break the builds. Another patch should remove the global variable Make trick from development/tools/emulator/system after this patch. Change-Id: I97332216b311608de61919cb75f4b760b249c0d9 --- emulator/sensors/Android.mk | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 emulator/sensors/Android.mk (limited to 'emulator/sensors/Android.mk') diff --git a/emulator/sensors/Android.mk b/emulator/sensors/Android.mk new file mode 100644 index 0000000..9b0e83d --- /dev/null +++ b/emulator/sensors/Android.mk @@ -0,0 +1,38 @@ +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# 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) +# HAL module implemenation, not prelinked and stored in +# hw/..so +include $(CLEAR_VARS) +LOCAL_PRELINK_MODULE := false +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +LOCAL_SHARED_LIBRARIES := liblog libcutils +LOCAL_SRC_FILES := sensors_qemu.c +LOCAL_MODULE := sensors.goldfish +LOCAL_MODULE_TAGS := debug +include $(BUILD_SHARED_LIBRARY) +endif + +endif # BUILD_EMULATOR_SENSORS_MODULE -- cgit v1.1