diff --git a/tools/elftree/Android.mk b/tools/elftree/Android.mk index c2199aaca..632727388 100644 --- a/tools/elftree/Android.mk +++ b/tools/elftree/Android.mk @@ -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) diff --git a/tools/emulator/opengl/common.mk b/tools/emulator/opengl/common.mk index 8f31e17f2..6dd503e9c 100644 --- a/tools/emulator/opengl/common.mk +++ b/tools/emulator/opengl/common.mk @@ -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)) - diff --git a/tools/emulator/opengl/system/egl/Android.mk b/tools/emulator/opengl/system/egl/Android.mk index cf55b4824..a9790890b 100644 --- a/tools/emulator/opengl/system/egl/Android.mk +++ b/tools/emulator/opengl/system/egl/Android.mk @@ -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) diff --git a/tools/emulator/opengl/tests/gles_android_wrapper/Android.mk b/tools/emulator/opengl/tests/gles_android_wrapper/Android.mk index f5254b777..d97212df4 100644 --- a/tools/emulator/opengl/tests/gles_android_wrapper/Android.mk +++ b/tools/emulator/opengl/tests/gles_android_wrapper/Android.mk @@ -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) - - - - diff --git a/tools/emulator/system/camera/Android.mk b/tools/emulator/system/camera/Android.mk index 3843c1dfc..83dcefed0 100755 --- a/tools/emulator/system/camera/Android.mk +++ b/tools/emulator/system/camera/Android.mk @@ -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 diff --git a/tools/emulator/system/gps/Android.mk b/tools/emulator/system/gps/Android.mk index 9daf4d6be..6840f8459 100644 --- a/tools/emulator/system/gps/Android.mk +++ b/tools/emulator/system/gps/Android.mk @@ -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 diff --git a/tools/emulator/system/libqemu/tests.mk b/tools/emulator/system/libqemu/tests.mk index 3e89b2332..886973fbf 100644 --- a/tools/emulator/system/libqemu/tests.mk +++ b/tools/emulator/system/libqemu/tests.mk @@ -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) diff --git a/tools/emulator/system/lights/Android.mk b/tools/emulator/system/lights/Android.mk index f0f76dc47..3fa04ed08 100644 --- a/tools/emulator/system/lights/Android.mk +++ b/tools/emulator/system/lights/Android.mk @@ -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) diff --git a/tools/emulator/system/qemu-props/Android.mk b/tools/emulator/system/qemu-props/Android.mk index 1b2932f1c..885e5b777 100644 --- a/tools/emulator/system/qemu-props/Android.mk +++ b/tools/emulator/system/qemu-props/Android.mk @@ -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 diff --git a/tools/emulator/system/qemud/Android.mk b/tools/emulator/system/qemud/Android.mk index 5666a74a1..237572c38 100644 --- a/tools/emulator/system/qemud/Android.mk +++ b/tools/emulator/system/qemud/Android.mk @@ -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 \ No newline at end of file diff --git a/tools/emulator/system/sensors/Android.mk b/tools/emulator/system/sensors/Android.mk index 4ae048b11..a1b8967e4 100644 --- a/tools/emulator/system/sensors/Android.mk +++ b/tools/emulator/system/sensors/Android.mk @@ -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/..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