diff options
| author | Sen Jiang <senj@google.com> | 2018-08-09 16:52:23 -0700 |
|---|---|---|
| committer | Sen Jiang <senj@google.com> | 2018-08-10 11:07:06 -0700 |
| commit | 0fa01c38cc2beff8d7e11e4b512692ecdb640ca8 (patch) | |
| tree | 279e9e692e3a7db704f65e6d3977e43e8e75b46a /Android.bp | |
| parent | b5f20f52ab0885f1676b1c2024df541b3e6cc5f5 (diff) | |
| parent | 904c2c9cd8d5ff06783030fb27ee23dcff743035 (diff) | |
| download | libbrillo-0fa01c38cc2beff8d7e11e4b512692ecdb640ca8.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into aosp/master.android-o-mr1-iot-release-1.0.4
Merge Chromium ToT to AOSP:
git fetch aosp upstream-master
git merge -X patience aosp/upstream-master
Bug: 112326236
Test: libbrillo_test
Change-Id: I35fbbddad556b051ce12b9cdd95bb2afef3cf6af
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -22,6 +22,7 @@ libbrillo_core_sources = [ "brillo/errors/error.cc", "brillo/errors/error_codes.cc", "brillo/flag_helper.cc", + "brillo/imageloader/manifest.cc", "brillo/key_value_store.cc", "brillo/message_loops/base_message_loop.cc", "brillo/message_loops/message_loop.cc", @@ -97,6 +98,7 @@ libbrillo_test_sources = [ "brillo/http/http_request_unittest.cc", "brillo/http/http_transport_curl_unittest.cc", "brillo/http/http_utils_unittest.cc", + "brillo/imageloader/manifest_unittest.cc", "brillo/key_value_store_unittest.cc", "brillo/map_utils_unittest.cc", "brillo/message_loops/base_message_loop_unittest.cc", @@ -292,4 +294,3 @@ cc_test { cflags: libbrillo_CFLAGS, cppflags: ["-Wno-sign-compare"], } - |