diff options
| -rw-r--r-- | Android.mk | 39 | ||||
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | third_party/libevent/Android.mk | 27 | ||||
| -rw-r--r-- | third_party/libevent/MODULE_LICENSE_BSD_LIKE | 0 | ||||
| -rw-r--r-- | third_party/libevent/NOTICE | 24 | ||||
| -rw-r--r-- | third_party/libevent/ThirdPartyProject.prop | 7 | ||||
| -rw-r--r-- | third_party/modp_b64/Android.mk | 22 | ||||
| -rw-r--r-- | third_party/modp_b64/MODULE_LICENSE_BSD_LIKE | 0 | ||||
| -rw-r--r-- | third_party/modp_b64/NOTICE | 33 | ||||
| -rw-r--r-- | third_party/modp_b64/ThirdPartyProject.prop | 8 |
10 files changed, 127 insertions, 34 deletions
@@ -1,37 +1,10 @@ -#################################### -# 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 -ifeq ($(TARGET_SIMULATOR),true) -LOCAL_CFLAGS += -D_EVENT_HAVE_FD_MASK=1 -endif - -include $(BUILD_STATIC_LIBRARY) - - ################################### # Build the libchromium_net library +LOCAL_PATH := $(call my-dir) +include external/chromium/third_party/libevent/Android.mk +include external/chromium/third_party/modp_b64/Android.mk + include $(CLEAR_VARS) LOCAL_CPP_EXTENSION := .cc @@ -161,8 +134,6 @@ LOCAL_SRC_FILES := \ \ chrome/browser/net/sqlite_persistent_cookie_store.cc \ \ - third_party/modp_b64/modp_b64.cc \ - \ net/base/address_list.cc \ net/base/address_list_net_log_param.cc \ net/base/android_network_library.cc \ @@ -500,7 +471,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_C_INCLUDES) #LOCAL_STATIC_LIBRARIES += libevent -LOCAL_WHOLE_STATIC_LIBRARIES += libevent libprotobuf-cpp-2.3.0-lite +LOCAL_WHOLE_STATIC_LIBRARIES += libevent libprotobuf-cpp-2.3.0-lite modp_b64 # Including this will modify the include path include external/stlport/libstlport.mk diff --git a/CleanSpec.mk b/CleanSpec.mk index 17011fb..4e24232 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -45,6 +45,7 @@ #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libchromium_net_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libchromium_net_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/third_party/libevent/Android.mk b/third_party/libevent/Android.mk new file mode 100644 index 0000000..00bdf6b --- /dev/null +++ b/third_party/libevent/Android.mk @@ -0,0 +1,27 @@ +#################################### +# Build libevent as separate library + +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 +ifeq ($(TARGET_SIMULATOR),true) +LOCAL_CFLAGS += -D_EVENT_HAVE_FD_MASK=1 +endif + +include $(BUILD_STATIC_LIBRARY) diff --git a/third_party/libevent/MODULE_LICENSE_BSD_LIKE b/third_party/libevent/MODULE_LICENSE_BSD_LIKE new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/third_party/libevent/MODULE_LICENSE_BSD_LIKE diff --git a/third_party/libevent/NOTICE b/third_party/libevent/NOTICE new file mode 100644 index 0000000..af977a4 --- /dev/null +++ b/third_party/libevent/NOTICE @@ -0,0 +1,24 @@ +Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> +Copyright 2007-2009 Niels Provos and Nick Mathewson + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/third_party/libevent/ThirdPartyProject.prop b/third_party/libevent/ThirdPartyProject.prop new file mode 100644 index 0000000..ebd5558 --- /dev/null +++ b/third_party/libevent/ThirdPartyProject.prop @@ -0,0 +1,7 @@ +# Copyright 2011 Google Inc. All Rights Reserved. +version=1.4.13-stable +isNative=true +name=libevent +onDevice=true +homepage=http://monkey.org/~provos/libevent/ + diff --git a/third_party/modp_b64/Android.mk b/third_party/modp_b64/Android.mk new file mode 100644 index 0000000..6148768 --- /dev/null +++ b/third_party/modp_b64/Android.mk @@ -0,0 +1,22 @@ +#################################### +# Build modp_b64 as separate library + +include $(CLEAR_VARS) + +LOCAL_CPP_EXTENSION := .cc +LOCAL_MODULE:= modp_b64 +LOCAL_MODULE_TAGS:= optional + +LOCAL_SRC_FILES := \ + third_party/modp_b64/modp_b64.cc + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/third_party/modp_b64 + +# Including this will modify the include path +include external/stlport/libstlport.mk + +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -fvisibility=hidden + +include $(BUILD_STATIC_LIBRARY) + diff --git a/third_party/modp_b64/MODULE_LICENSE_BSD_LIKE b/third_party/modp_b64/MODULE_LICENSE_BSD_LIKE new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/third_party/modp_b64/MODULE_LICENSE_BSD_LIKE diff --git a/third_party/modp_b64/NOTICE b/third_party/modp_b64/NOTICE new file mode 100644 index 0000000..55af76f --- /dev/null +++ b/third_party/modp_b64/NOTICE @@ -0,0 +1,33 @@ + * MODP_B64 - High performance base64 encoder/decoder + * Version 1.3 -- 17-Mar-2006 + * http://modp.com/release/base64 + * + * Copyright (c) 2005, 2006 Nick Galbreath -- nickg [at] modp [dot] com + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name of the modp.com nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/third_party/modp_b64/ThirdPartyProject.prop b/third_party/modp_b64/ThirdPartyProject.prop new file mode 100644 index 0000000..fc1a561 --- /dev/null +++ b/third_party/modp_b64/ThirdPartyProject.prop @@ -0,0 +1,8 @@ +# Copyright 2011 Google Inc. All Rights Reserved. +version=n/a +isNative=true +name=modp_b64 +keywords=base64 +onDevice=true +homepage=http://modp.com/ + |