Merge remote-tracking branch 'weave/master' into 'weave/aosp-master' 7071280 Fix some libevhtp usage details. 5616013 Merge remote-tracking branch 'weave/dev' into 'weave/master' c93476e libevhtp requires libevent-dev 3b8fbc5 Add customizable settings option for xmpp_endpoint 15888c7 cmake is used to build gtest and libevhtp ff46c93 Merge remote-tracking branch 'weave/master' into dev_review 08be74d Update libuweave/macaroon code 51c4d0d Revert "Make internal googletest optional." dcf2bde Fix incorrect weave setting file path 60b131c Make internal googletest optional. ddb8759 Make internal libevhtp optional. 4efdf46 Fix GCC warning 4fe71e3 Make App ID a part of User ID 3cbb686 Update macaroon lib with version supporting empty strings 8585d30 Remove unused line 69dd2e1 Merge remote-tracking branch 'weave/master' into dev_dev 70c8642 Add kUwMacaroonDelegateeTypeService caveat d5f7aab Add session ID validation d7c6deb Remove crypto type "None" d74a732 Update macaroon lib a821f2e Integrate new macaroon library 7d29a5a Update macaroon lib 1c83377 Fix build errors introduced by 9ac4c6c Merge remote-tracking branch 'weave/master' into 'weave/dev' 5a7c4f5 Add black list manager implementation 484b6e4 Update AccessBlackListManager interface 81ac16e Add MockConfigStore argument to disabled default expectations 07bb755 Merge remote-tracking branch 'weave/master' into dev_dev2 7329b74 Fix unittest compilation on GCC f533677 Implemented _accessControlBlackList trait 6741755 Merge remote-tracking branch 'weave/master' into dev_dev2 42e508f Add write callback into SaveSettings function 7ecdf95 Add |name| into LoadSettings/SaveSettings 8023b80 Merge remote-tracking branch 'weave/master' into dev_dev2
diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..5f654f6 --- /dev/null +++ b/Android.mk
@@ -0,0 +1,148 @@ +# Copyright (C) 2015 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(call my-dir) + +include $(LOCAL_PATH)/file_lists.mk + +# Common variables +# ======================================================== + +libweaveCommonCppExtension := .cc +libweaveCommonCFlags := -Wall -Werror \ + -Wno-char-subscripts -Wno-missing-field-initializers \ + -Wno-unused-function -Wno-unused-parameter + +libweaveCommonCppFlags := \ + -Wno-deprecated-register \ + -Wno-sign-compare \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor \ + +libweaveCommonCIncludes := \ + $(LOCAL_PATH)/.. \ + $(LOCAL_PATH)/include \ + $(LOCAL_PATH)/third_party/modp_b64/modp_b64 \ + $(LOCAL_PATH)/third_party/libuweave \ + external/gtest/include \ + +libweaveSharedLibraries := \ + libchrome \ + libexpat \ + libcrypto \ + +# libweave-external +# ======================================================== +include $(CLEAR_VARS) +LOCAL_MODULE := libweave-external +LOCAL_CPP_EXTENSION := $(libweaveCommonCppExtension) +LOCAL_CFLAGS := $(libweaveCommonCFlags) +LOCAL_CPPFLAGS := $(libweaveCommonCppFlags) +LOCAL_C_INCLUDES := $(libweaveCommonCIncludes) +LOCAL_SHARED_LIBRARIES := $(libweaveSharedLibraries) +LOCAL_STATIC_LIBRARIES := +LOCAL_CLANG := true +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/external + +LOCAL_SRC_FILES := \ + $(THIRD_PARTY_CHROMIUM_CRYPTO_SRC_FILES) \ + $(THIRD_PARTY_MODP_B64_SRC_FILES) \ + $(THIRD_PARTY_LIBUWEAVE_SRC_FILES) + +include $(BUILD_STATIC_LIBRARY) + +# libweave-common +# ======================================================== +include $(CLEAR_VARS) +LOCAL_MODULE := libweave-common +LOCAL_CPP_EXTENSION := $(libweaveCommonCppExtension) +LOCAL_CFLAGS := $(libweaveCommonCFlags) +LOCAL_CPPFLAGS := $(libweaveCommonCppFlags) +LOCAL_C_INCLUDES := $(libweaveCommonCIncludes) +LOCAL_SHARED_LIBRARIES := $(libweaveSharedLibraries) +LOCAL_STATIC_LIBRARIES := libweave-external +LOCAL_CLANG := true +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) + +LOCAL_SRC_FILES := $(WEAVE_SRC_FILES) + +include $(BUILD_STATIC_LIBRARY) + +# libweave-test +# ======================================================== +include $(CLEAR_VARS) +LOCAL_MODULE := libweave-test +LOCAL_CPP_EXTENSION := $(libweaveCommonCppExtension) +LOCAL_CFLAGS := $(libweaveCommonCFlags) +LOCAL_CPPFLAGS := $(libweaveCommonCppFlags) +LOCAL_C_INCLUDES := \ + $(libweaveCommonCIncludes) \ + external/gmock/include \ + +LOCAL_SHARED_LIBRARIES := $(libweaveSharedLibraries) +LOCAL_STATIC_LIBRARIES := libgtest libgmock +LOCAL_CLANG := true +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include + +LOCAL_SRC_FILES := $(WEAVE_TEST_SRC_FILES) + +include $(BUILD_STATIC_LIBRARY) + +# libweave +# ======================================================== +include $(CLEAR_VARS) +LOCAL_MODULE := libweave +LOCAL_CPP_EXTENSION := $(libweaveCommonCppExtension) +LOCAL_CFLAGS := $(libweaveCommonCFlags) +LOCAL_CPPFLAGS := $(libweaveCommonCppFlags) +LOCAL_C_INCLUDES := $(libweaveCommonCIncludes) +LOCAL_SHARED_LIBRARIES := $(libweaveSharedLibraries) +LOCAL_WHOLE_STATIC_LIBRARIES := libweave-common libweave-external +LOCAL_CLANG := true +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include + +LOCAL_SRC_FILES := + +include $(BUILD_SHARED_LIBRARY) + +# libweave_test +# ======================================================== +include $(CLEAR_VARS) +LOCAL_MODULE := libweave_test +LOCAL_MODULE_TAGS := debug +LOCAL_CPP_EXTENSION := $(libweaveCommonCppExtension) +LOCAL_CFLAGS := $(libweaveCommonCFlags) +LOCAL_CPPFLAGS := $(libweaveCommonCppFlags) +LOCAL_C_INCLUDES := \ + $(libweaveCommonCIncludes) \ + external/gmock/include \ + +LOCAL_SHARED_LIBRARIES := \ + $(libweaveSharedLibraries) \ + +LOCAL_STATIC_LIBRARIES := \ + libweave-common \ + libweave-external \ + libweave-test \ + libgtest libgmock \ + libchrome_test_helpers \ + +LOCAL_CLANG := true +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) + +LOCAL_SRC_FILES := \ + $(WEAVE_UNITTEST_SRC_FILES) \ + $(THIRD_PARTY_CHROMIUM_CRYPTO_UNITTEST_SRC_FILES) + +include $(BUILD_NATIVE_TEST)