diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-26 10:30:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-10-26 19:43:22 +0100 |
| commit | abb33ca831d3af78078559b28fe5d05718eceff6 (patch) | |
| tree | fabe91403123f975b6bb18ece2709571f5386b02 /Android.mk | |
| parent | 65c64122b408e176975718dffe88f4c55c066730 (diff) | |
| download | external_chromium-abb33ca831d3af78078559b28fe5d05718eceff6.zip external_chromium-abb33ca831d3af78078559b28fe5d05718eceff6.tar.gz external_chromium-abb33ca831d3af78078559b28fe5d05718eceff6.tar.bz2 | |
Syncing external/chromium with chromium release 61029, third_party/libevent
Libevent is now built as a separate library to remove
some old hacks, it should now be possible to upstream
the remaining local changes.
Also removed some makefiles that are not in chromium
Change-Id: I617823ca1a8516fe23d7ed26a608d4be80188cb2
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 40 |
1 files changed, 32 insertions, 8 deletions
@@ -1,7 +1,36 @@ +#################################### +# Build libevent as separate library + LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_MODULE:= libevent +LOCAL_MODULE_TAGS:= optional + +LOCAL_SRC_FILES := \ + third_party/libevent/event.c \ + third_party/libevent/evutil.c \ + third_party/libevent/epoll.c \ + third_party/libevent/log.c \ + third_party/libevent/poll.c \ + third_party/libevent/select.c \ + third_party/libevent/signal.c + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/third_party/libevent \ + $(LOCAL_PATH)/third_party/libevent/android \ + +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -fvisibility=hidden + +include $(BUILD_STATIC_LIBRARY) + + +################################### +# Build the libchromium_net library + +include $(CLEAR_VARS) + LOCAL_CPP_EXTENSION := .cc LOCAL_MODULE := libchromium_net @@ -296,14 +325,6 @@ LOCAL_SRC_FILES := \ sdch/open-vcdiff/src/vcdecoder.cc \ sdch/open-vcdiff/src/vcdiffengine.cc \ sdch/open-vcdiff/src/vcencoder.cc \ - \ - third_party/libevent/event.c \ - third_party/libevent/evutil.c \ - third_party/libevent/epoll.c \ - third_party/libevent/log.c \ - third_party/libevent/poll.c \ - third_party/libevent/select.c \ - third_party/libevent/signal.c # AutoFill++ source files. LOCAL_SRC_FILES += \ @@ -439,6 +460,9 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/android \ $(LOCAL_C_INCLUDES) +#LOCAL_STATIC_LIBRARIES += libevent +LOCAL_WHOLE_STATIC_LIBRARIES += libevent + # Including this will modify the include path include external/stlport/libstlport.mk endif |