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

am 7b9e308b: Merge ""debug" in those modules is discouraged"

Browse Source 
* commit '7b9e308b95ff1bd92ca8d4343a4ed43d87bbd6b6':
  "debug" in those modules is discouraged
This commit is contained in:
Ying Wang
2013-03-07 17:30:03 -08:00
committed by Android Git Automerger
parent 7398b953ed 7b9e308b95
commit f39c1088f0
11 changed files with 4 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/elftree/Android.mk
View File

@@ -29,7 +29,6 @@ ifdef cur_platform
#LOCAL_SHARED_LIBRARIES := $(shared_libraries)
#LOCAL_STATIC_LIBRARIES := $(static_libraries)
#LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
#LOCAL_MODULE_TAGS := debug
#LOCAL_LDLIBS +=
#include $(BUILD_EXECUTABLE)

2
tools/emulator/opengl/common.mk
View File

@@ -31,7 +31,6 @@ _emugl_HOST_modules :=
emugl-begin-module = \
$(eval include $(CLEAR_VARS)) \
$(eval LOCAL_MODULE := $1) \
$(eval LOCAL_MODULE_TAGS := debug) \
$(eval LOCAL_MODULE_CLASS := $(patsubst HOST_%,%,$(patsubst %EXECUTABLE,%EXECUTABLES,$(patsubst %LIBRARY,%LIBRARIES,$2)))) \
$(eval LOCAL_IS_HOST_MODULE := $(if $3,true,))\
$(eval LOCAL_C_INCLUDES := $(EMUGL_COMMON_INCLUDES)) \
@@ -239,4 +238,3 @@ emugl-set-shared-library-subpath = \
$(eval LOCAL_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$1)\
$(eval _emugl.$(LOCAL_MODULE).moved := true)\
$(call emugl-export-outer,ADDITIONAL_DEPENDENCIES,$(LOCAL_MODULE_PATH)/$(LOCAL_MODULE)$(TARGET_SHLIB_SUFFIX))

1
tools/emulator/opengl/system/egl/Android.mk
View File

@@ -33,7 +33,6 @@ LOCAL_MODULE := egl.cfg
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/egl
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_CLASS := ETC
include $(BUILD_PREBUILT)

6
tools/emulator/opengl/tests/gles_android_wrapper/Android.mk
View File

@@ -56,7 +56,6 @@ LOCAL_MODULE := egl.cfg
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/egl
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_CLASS := ETC
include $(BUILD_PREBUILT)
@@ -70,11 +69,6 @@ LOCAL_MODULE := gles_emul.cfg
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(TARGET_OUT)/etc
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_CLASS := ETC
include $(BUILD_PREBUILT)

5
tools/emulator/system/camera/Android.mk
View File

@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
ifndef BUILD_EMULATOR_CAMERA_HAL
BUILD_EMULATOR_CAMERA_HAL := true
LOCAL_PATH := $(call my-dir)
@@ -71,7 +69,4 @@ else
LOCAL_MODULE := camera.goldfish
endif
LOCAL_MODULE_TAGS := debug
include $(BUILD_SHARED_LIBRARY)
endif # BUILD_EMULATOR_CAMERA_HAL

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

@@ -17,8 +17,6 @@
# 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)
@@ -35,7 +33,4 @@ LOCAL_MODULE := gps.vbox_x86
else
LOCAL_MODULE := gps.goldfish
endif
LOCAL_MODULE_TAGS := debug
include $(BUILD_SHARED_LIBRARY)
endif # BUILD_EMULATOR_GPS_MODULE

8
tools/emulator/system/libqemu/tests.mk
View File

@@ -6,25 +6,25 @@
include $(CLEAR_VARS)
LOCAL_MODULE := test-libqemu-1
LOCAL_SRC_FILES := test_host_1.c
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_TAGS := tests
include $(BUILD_HOST_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_MODULE := test-libqemu-2
LOCAL_SRC_FILES := test_host_2.c
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_TAGS := tests
include $(BUILD_HOST_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_MODULE := test-libqemu-1
LOCAL_SRC_FILES := test_guest_1.c test_util.c
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_LIBRARIES := libcutils
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_MODULE := test-libqemu-2
LOCAL_SRC_FILES := test_guest_2.c test_util.c
LOCAL_MODULE_TAGS := debug
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_LIBRARIES := libcutils
include $(BUILD_EXECUTABLE)

1
tools/emulator/system/lights/Android.mk
View File

@@ -22,6 +22,5 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_SRC_FILES := lights_qemu.c
LOCAL_MODULE := lights.goldfish
LOCAL_MODULE_TAGS := debug
LOCAL_CFLAGS += -DLIGHT_BACKLIGHT
include $(BUILD_SHARED_LIBRARY)

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

@@ -16,13 +16,6 @@
# 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)
# The 'qemu-props' program is run from /system/etc/init.goldfish.rc
@@ -32,9 +25,4 @@ 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 # BUILD_EMULATOR_QEMU_PROPS

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

@@ -4,8 +4,6 @@
# 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)
@@ -18,8 +16,5 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
LOCAL_MODULE:= qemud
LOCAL_MODULE_TAGS := debug
include $(BUILD_EXECUTABLE)
endif # BUILD_EMULATOR_QEMUD

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

@@ -13,16 +13,8 @@
# 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 stored in
# hw/<SENSORS_HARDWARE_MODULE_ID>.<ro.hardware>.so
include $(CLEAR_VARS)
@@ -35,8 +27,4 @@ LOCAL_MODULE := sensors.vbox_x86
else
LOCAL_MODULE := sensors.goldfish
endif
LOCAL_MODULE_TAGS := debug
include $(BUILD_SHARED_LIBRARY)
endif
endif # BUILD_EMULATOR_SENSORS_MODULE