diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-12 12:15:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 12:15:07 -0700 |
| commit | 8c55a9a57e4f13ec420c3de7b3abfdcf454f6633 (patch) | |
| tree | f72fd5b0d50af585d7d4c644f84a288dffbc2946 /libs/ui | |
| parent | 067b873f7cc3d1b3e83604b78f8c0dc769f870b1 (diff) | |
| parent | bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e (diff) | |
| download | frameworks_base-8c55a9a57e4f13ec420c3de7b3abfdcf454f6633.zip frameworks_base-8c55a9a57e4f13ec420c3de7b3abfdcf454f6633.tar.gz frameworks_base-8c55a9a57e4f13ec420c3de7b3abfdcf454f6633.tar.bz2 | |
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
Diffstat (limited to 'libs/ui')
| -rw-r--r-- | libs/ui/Android.mk | 4 | ||||
| -rw-r--r-- | libs/ui/tests/Android.mk | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk index 427bbba..fbabfc4 100644 --- a/libs/ui/Android.mk +++ b/libs/ui/Android.mk @@ -68,10 +68,6 @@ LOCAL_C_INCLUDES := \ LOCAL_MODULE:= libui -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_LDLIBS += -lpthread -endif - include $(BUILD_SHARED_LIBRARY) diff --git a/libs/ui/tests/Android.mk b/libs/ui/tests/Android.mk index e231971..693a32a 100644 --- a/libs/ui/tests/Android.mk +++ b/libs/ui/tests/Android.mk @@ -2,8 +2,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -ifneq ($(TARGET_SIMULATOR),true) - # Build the unit tests. test_src_files := \ InputChannel_test.cpp \ @@ -48,5 +46,3 @@ $(foreach file,$(test_src_files), \ # Build the manual test programs. include $(call all-subdir-makefiles) - -endif
\ No newline at end of file |