LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 832388de: am 13a0b81c: Merge "Revert 776bd3e46c2fb5c003ecec4fee99f01943876644"

Browse Source 
* commit '832388de41c6b44d43bd1f1307b3386d0fcc376e':
  Revert 776bd3e46c
This commit is contained in:
David 'Digit' Turner
2011-04-14 07:39:04 -07:00
committed by Android Git Automerger
parent 13e07e5c66 832388de41
commit 62b21b4146
4 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/emulator/system/gps/Android.mk
View File

@@ -12,6 +12,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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) LOCAL_PATH := $(call my-dir)
ifneq ($(TARGET_PRODUCT),sim) ifneq ($(TARGET_PRODUCT),sim)
@@ -27,3 +35,5 @@ LOCAL_MODULE := gps.goldfish
LOCAL_MODULE_TAGS := debug LOCAL_MODULE_TAGS := debug
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
endif endif
endif # BUILD_EMULATOR_GPS_MODULE

9
tools/emulator/system/qemu-props/Android.mk
View File

@@ -16,6 +16,13 @@
# that should only run in the emulator. # 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) LOCAL_PATH := $(call my-dir)
ifneq ($(TARGET_PRODUCT),sim) ifneq ($(TARGET_PRODUCT),sim)
@@ -33,3 +40,5 @@ LOCAL_MODULE_TAGS := debug
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
endif # TARGET_PRODUCT != sim endif # TARGET_PRODUCT != sim
endif # BUILD_EMULATOR_QEMU_PROPS

9
tools/emulator/system/qemud/Android.mk
View File

@@ -1,5 +1,12 @@
# Copyright 2008 The Android Open Source Project # 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) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -14,3 +21,5 @@ LOCAL_MODULE:= qemud
LOCAL_MODULE_TAGS := debug LOCAL_MODULE_TAGS := debug
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
endif # BUILD_EMULATOR_QEMUD

10
tools/emulator/system/sensors/Android.mk
View File

@@ -12,6 +12,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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) LOCAL_PATH := $(call my-dir)
ifneq ($(TARGET_PRODUCT),sim) ifneq ($(TARGET_PRODUCT),sim)
@@ -26,3 +34,5 @@ LOCAL_MODULE := sensors.goldfish
LOCAL_MODULE_TAGS := debug LOCAL_MODULE_TAGS := debug
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
endif endif
endif # BUILD_EMULATOR_SENSORS_MODULE