Merge "Try to fix the simulator build." (7c32c0df) · Commits · e / os / android_frameworks_base

media/mtp/Android.mk

+4 −5

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@
		#
		LOCAL_PATH:= $(call my-dir)

		ifneq ($(TARGET_SIMULATOR),true)

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		@@ -49,6 +47,8 @@ LOCAL_CFLAGS := -DMTP_DEVICE -DMTP_HOST

		include $(BUILD_STATIC_LIBRARY)

		ifneq ($(TARGET_SIMULATOR),true)

		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		@@ -65,8 +65,6 @@ LOCAL_STATIC_LIBRARIES := libmtp

		include $(BUILD_EXECUTABLE)

		endif

		include $(CLEAR_VARS)

		LOCAL_MODULE := scantest
		@@ -88,8 +86,9 @@ LOCAL_SRC_FILES:= \
		LOCAL_C_INCLUDES := external/sqlite/dist
		LOCAL_SHARED_LIBRARIES := libutils libsqlite libstagefright libmedia


		LOCAL_CFLAGS := -g
		LOCAL_LDFLAGS := -g

		include $(BUILD_EXECUTABLE)

		endif