diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-03-21 15:52:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-21 15:52:58 +0000 |
| commit | e90131f979ed3d59913b6f9386da18a408324591 (patch) | |
| tree | 4dddb45794f5bae4e6fa56974956fee9e3603055 | |
| parent | 7b9155460f7441c1431e1c0eed5ac991acb39aa7 (diff) | |
| parent | f151b2be0e50d44871444598fd910d3710eb5bee (diff) | |
| download | platform_external_libbrillo-e90131f979ed3d59913b6f9386da18a408324591.tar.gz platform_external_libbrillo-e90131f979ed3d59913b6f9386da18a408324591.tar.bz2 platform_external_libbrillo-e90131f979ed3d59913b6f9386da18a408324591.zip | |
libbrillo: Update Chrome OS gyp files to refer to new libchrome revision
am: f151b2b
* commit 'f151b2be0e50d44871444598fd910d3710eb5bee':
libbrillo: Update Chrome OS gyp files to refer to new libchrome revision
| -rw-r--r-- | brillo/value_conversion_unittest.cc | 1 | ||||
| -rw-r--r-- | libbrillo-381699.gypi (renamed from libbrillo-369476.gypi) | 2 | ||||
| -rw-r--r-- | libbrillo.gyp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/brillo/value_conversion_unittest.cc b/brillo/value_conversion_unittest.cc index cf2afb7..7f0b693 100644 --- a/brillo/value_conversion_unittest.cc +++ b/brillo/value_conversion_unittest.cc @@ -14,6 +14,7 @@ #include <brillo/value_conversion.h> +#include <algorithm> #include <limits> #include <memory> #include <string> diff --git a/libbrillo-369476.gypi b/libbrillo-381699.gypi index 1046701..c36aaf5 100644 --- a/libbrillo-369476.gypi +++ b/libbrillo-381699.gypi @@ -1,6 +1,6 @@ { 'variables': { - 'libbase_ver': 369476, + 'libbase_ver': 381699, }, 'includes': [ '../libbrillo/libbrillo.gypi', diff --git a/libbrillo.gyp b/libbrillo.gyp index 735d48c..14fc874 100644 --- a/libbrillo.gyp +++ b/libbrillo.gyp @@ -1,6 +1,6 @@ { 'includes': [ - 'libbrillo-369476.gypi', + 'libbrillo-381699.gypi', 'libpolicy.gypi', ] } |