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/utils | |
| 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/utils')
| -rw-r--r-- | libs/utils/Android.mk | 4 | ||||
| -rw-r--r-- | libs/utils/tests/Android.mk | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk index 774e8c9..f633357 100644 --- a/libs/utils/Android.mk +++ b/libs/utils/Android.mk @@ -103,17 +103,14 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libcutils -ifneq ($(TARGET_SIMULATOR),true) ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86) # This is needed on x86 to bring in dl_iterate_phdr for CallStack.cpp LOCAL_SHARED_LIBRARIES += libdl endif # linux-x86 -endif # sim LOCAL_MODULE:= libutils include $(BUILD_SHARED_LIBRARY) -ifneq ($(TARGET_SIMULATOR),true) ifeq ($(TARGET_OS),linux) include $(CLEAR_VARS) LOCAL_C_INCLUDES += external/zlib external/icu4c/common @@ -122,7 +119,6 @@ LOCAL_MODULE := libutils LOCAL_SRC_FILES := $(commonSources) BackupData.cpp BackupHelpers.cpp include $(BUILD_STATIC_LIBRARY) endif -endif # Include subdirectory makefiles diff --git a/libs/utils/tests/Android.mk b/libs/utils/tests/Android.mk index 87ad98e..8726a53 100644 --- a/libs/utils/tests/Android.mk +++ b/libs/utils/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 := \ BlobCache_test.cpp \ @@ -43,5 +41,3 @@ $(foreach file,$(test_src_files), \ $(eval LOCAL_MODULE_TAGS := $(module_tags)) \ $(eval include $(BUILD_EXECUTABLE)) \ ) - -endif |