Merge remote-tracking branch 'weave/master' into 'weave/aosp-master' 37994f4 Fix some of compiler warnings. ebde3c1 Rename *BlackList* into *Revocation* efbd66b Remove unused constants 5a1990f Implement revocation list check when validating auth token 51dcfad Add revocationTimestamp parameter into revocation entry 4846c44 Remove AccessBlackListManager::Unblock 958a359 Revert "debian: add debian packaging files" 7f2a5dc daemon: register device after component init 89b3495 Removing legacy API from libweave 1054d3e Move minimalRole constants from schema_constants.h to a local .cc file 9e9023e daemon/light: fix light trait def 6da60ad Fix use-after-free detected by ASAN c23ea22 Replace expirationTimeoutSec with expirationTime 7c0ea69 Rename _accessControlBlackList into _accessRevocationList 012cd98 Move mock_component_manager.h into test/ dir c6d99bb Move MockAccessBlackListManager into separate file b612e3c Reset access token secret on new black list entry d1d52e7 Add AccessBlackListManager::AddEntryAddedCallback 7fc5434 debian: add debian packaging files 634c408 Remove property from json added by mistake Change-Id: I69380e60cf9888999224fdf11a5bc35f0bc7bda2
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)