Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'
This merge includes the following commits:
dcc0dca libweave: Convert the blacklist trait into a standard one
5fe0ac0 examples: refactor README file
3127cb3 Tweak the README.md with respect to the repo subdirectories.
38a2aef libweave: Remove release() calls on scoped_ptr
bf79a9e libweave: Port base/ changes from Chromium project
b9bbdc6 libweave: Fix compile errors on Chrome OS
5c2870f libevhtp: build checked out copy
3e4d883 add integrated cross-compile & qemu support
7fb7903 examples/daemon/ledflasher: switch to onOff
0011064 readme: add more tips/links
d70a965 gtest/gmock: build checked out copy
8bf4757 Fail setup/start if device already registered
cd7a3a2 Add HTTPS port into TXT record
5ddd991 Return 'component' in command JSON
00180aa Avoid Revocation list overflow
b506696 Bound j2000 timestamps into [0, <int32_t>::max()] interval
e733c38 Take into account scope from /privet/v3/auth call
8b897af examples/daemon: fix ledflasher param names
978e712 Implement local_discovery_enabled setting
e4b8ccf Remove ObserverList from cloud delegate
1c6837f Remove CloudDelegate::Observer::OnDeviceInfoChanged
63feef5 Fixed issues configuring devices with date before 2000.
86e8f63 Update READMEs to reflect cloud_id name in Cloud Services for deviceId Added git add <files> in README for Making Changes
80c65d2 VERISON: Initial commit on master - 1.4.1
98af48b Update macaroon lib
fafbc5d Insert the description of the change.
5e94dc8 Applied clang-format
b741d64 Fix crash when device in access point mode
0d3062e Implement minimalRole for state definitions
c7fab18 Update _accessRevocationList trait
b18bead Fixes to event_http_server for examples
a07bbc7 Add provider::Wifi::GetConnectedSsid
c96ee4e examples/lock: fix lock trait
f7bfb6a examples/speaker: fix volume trait
2419a2a Update local auth info if server side information does not match
b7e0996 Simplify few comparison helpers
497559b Moved previous comment to README file
Change-Id: Ibd3ca55fb07b816b60489e458f5e905d260c683f
diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..c0525ae
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,145 @@
+# 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 -Wextra -Werror \
+ -Wno-missing-field-initializers \
+ -Wno-unused-parameter \
+
+libweaveCommonCppFlags :=
+
+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)
