diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-05-20 23:12:45 -0700 |
|---|---|---|
| committer | Luis Hector Chavez <lhchavez@google.com> | 2016-05-26 11:30:11 -0700 |
| commit | c0413cc291345e498ee7d9f8eb478de7fedc8e51 (patch) | |
| tree | 643ebe0b50aab41fcafc91ef9d2df86269fe53ae | |
| parent | 3a84e4d300ed4f09dd519c452d8b3d3bd110f442 (diff) | |
| download | firewalld-n-iot-preview-2.tar.gz | |
firewalld: Update libchrome APIs to r395517android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.
Change-Id: I8a9d29713657c2791049de21e98ad15d1ed358ad
| -rw-r--r-- | firewall_service.h | 5 | ||||
| -rw-r--r-- | include/firewalld/firewall.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/firewall_service.h b/firewall_service.h index 2cf5218..bcfb546 100644 --- a/firewall_service.h +++ b/firewall_service.h @@ -15,9 +15,12 @@ #ifndef FIREWALLD_FIREWALL_SERVICE_H_ #define FIREWALLD_FIREWALL_SERVICE_H_ +#if !defined(__ANDROID__) +# include <memory> +#endif // !__ANDROID__ + #include <base/callback.h> #include <base/macros.h> -#include <base/memory/scoped_ptr.h> #include <base/memory/weak_ptr.h> #include <brillo/dbus/dbus_object.h> diff --git a/include/firewalld/firewall.h b/include/firewalld/firewall.h index d61ac2b..04718fa 100644 --- a/include/firewalld/firewall.h +++ b/include/firewalld/firewall.h @@ -16,6 +16,8 @@ #define FIREWALLD_BINDER_CLIENT_FIREWALL_H_ #include <memory> +#include <string> +#include <vector> #include <binderwrapper/binder_wrapper.h> |