aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/tools/Android.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-02-28 16:29:58 -0800
committerYing Wang <wangying@google.com>2013-02-28 16:45:05 -0800
commit4d54754d56893d6069547cd1124b5222b1318b1b (patch)
tree34128f1733c6dc803c758b452e4fc0670adb901e /emulator/tools/Android.mk
parentfb13a8362b46f2603c22dab4f560c301876f4ead (diff)
downloadsdk-4d54754d56893d6069547cd1124b5222b1318b1b.zip
sdk-4d54754d56893d6069547cd1124b5222b1318b1b.tar.gz
sdk-4d54754d56893d6069547cd1124b5222b1318b1b.tar.bz2
Delete duplicate files
These files are already in development/tools/emulator. Change-Id: I58988ce49804583b06e7d93380c44ba800448216
Diffstat (limited to 'emulator/tools/Android.mk')
-rw-r--r--emulator/tools/Android.mk44
1 files changed, 0 insertions, 44 deletions
diff --git a/emulator/tools/Android.mk b/emulator/tools/Android.mk
deleted file mode 100644
index 1bdbf68..0000000
--- a/emulator/tools/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.
-
-# this file is used to build emulator-specific program tools
-# 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)
-
-# The 'qemu-props' program is run from /system/etc/init.goldfish.rc
-# to setup various system properties sent by the emulator program.
-#
-include $(CLEAR_VARS)
-LOCAL_MODULE := qemu-props
-LOCAL_SRC_FILES := qemu-props.c
-LOCAL_SHARED_LIBRARIES := libcutils
-# we don't want this in 'user' builds which don't have
-# emulator-specific binaries.
-LOCAL_MODULE_TAGS := debug
-include $(BUILD_EXECUTABLE)
-
-endif # TARGET_PRODUCT != sim
-
-endif # BUILD_EMULATOR_QEMU_PROPS