diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-06-01 22:33:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 22:33:36 +0000 |
| commit | dc16989a4d0257f7693d25e998b177de553f5c0d (patch) | |
| tree | 643ebe0b50aab41fcafc91ef9d2df86269fe53ae | |
| parent | d5887e8685d4e2621acd8f8a3b89cdf3651ca925 (diff) | |
| parent | 9c418d8540c9b8a90888a03ef97b3f0686db5e40 (diff) | |
| download | firewalld-dc16989a4d0257f7693d25e998b177de553f5c0d.tar.gz | |
firewalld: Update libchrome APIs to r395517 am: c0413cc291
am: 9c418d8540
* commit '9c418d8540c9b8a90888a03ef97b3f0686db5e40':
firewalld: Update libchrome APIs to r395517
Change-Id: Ib42318ed011367c662833dc4ba38891600637e59
| -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> |