diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-06-30 19:23:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-30 19:23:42 -0700 |
| commit | 7c32c0dfb476488f3133755f325a6e0405970fce (patch) | |
| tree | b20e0995a9d4d923ae20b94343d16b37e1580214 | |
| parent | c18a9f20516f91b00eaec0cefbf795eca08d4d6a (diff) | |
| parent | 072339405191492e85e12e164a36c4cd15858790 (diff) | |
| download | frameworks_base-7c32c0dfb476488f3133755f325a6e0405970fce.zip frameworks_base-7c32c0dfb476488f3133755f325a6e0405970fce.tar.gz frameworks_base-7c32c0dfb476488f3133755f325a6e0405970fce.tar.bz2 | |
Merge "Try to fix the simulator build."
| -rw-r--r-- | media/mtp/Android.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/media/mtp/Android.mk b/media/mtp/Android.mk index f363b7c..3c9909b 100644 --- a/media/mtp/Android.mk +++ b/media/mtp/Android.mk @@ -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 |