diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-12 12:12:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 12:12:42 -0700 |
| commit | 9f5ee29cc6202d523b1002cf85116b583156e107 (patch) | |
| tree | e0ca26b42deabb43b6732778b047e47c4a4f2ab9 | |
| parent | 9276c04a9dd0d2f120860cb824a02493aad163fd (diff) | |
| parent | f9cc5396549e1896bbeb2268e33269ae6c9a1889 (diff) | |
| download | chromium-9f5ee29cc6202d523b1002cf85116b583156e107.tar.gz | |
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | third_party/libevent/Android.mk | 3 |
2 files changed, 0 insertions, 5 deletions
@@ -460,7 +460,6 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -fvisibility=hidden -DEXPAT_RELATIVE_PATH -DALLOW_QUOTED_COOKIE_VALUES LOCAL_CPPFLAGS := -Wno-sign-promo -Wno-missing-field-initializers -ifneq ($(TARGET_SIMULATOR),true) # Just a few definitions not provided by bionic. LOCAL_CFLAGS += -include "android/prefix.h" @@ -475,6 +474,5 @@ LOCAL_WHOLE_STATIC_LIBRARIES += libevent libprotobuf-cpp-2.3.0-lite modp_b64 dmg # Including this will modify the include path include external/stlport/libstlport.mk -endif include $(BUILD_STATIC_LIBRARY) diff --git a/third_party/libevent/Android.mk b/third_party/libevent/Android.mk index 00bdf6b6..c654937a 100644 --- a/third_party/libevent/Android.mk +++ b/third_party/libevent/Android.mk @@ -20,8 +20,5 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/third_party/libevent/android LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -fvisibility=hidden -ifeq ($(TARGET_SIMULATOR),true) -LOCAL_CFLAGS += -D_EVENT_HAVE_FD_MASK=1 -endif include $(BUILD_STATIC_LIBRARY) |