Use __ANDROID__ instead of __BRILLO__.

__ANDROID__ is defined automatically by the toolchain.

Bug: 23358460
Change-Id: I7487625802deb48ff31da8410125fa910a88ca74

5 files changed, 19 insertions, 19 deletions

diff --git a/Android.mk b/Android.mk
index 3dfc452..46d1898 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,7 +29,7 @@ define firewalld_common
       libchromeos-minijail \
       libdbus \
       libminijail
-  LOCAL_CFLAGS += -D__BRILLO__ -Wall -Werror -Wno-unused-parameter
+  LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter
   LOCAL_CPPFLAGS += -Wno-sign-promo
 endef
 
diff --git a/firewall_service.cc b/firewall_service.cc
index 648684a..2969682 100644
--- a/firewall_service.cc
+++ b/firewall_service.cc
@@ -28,7 +28,7 @@ FirewallService::FirewallService(
 void FirewallService::RegisterAsync(const CompletionAction& callback) {
   RegisterWithDBusObject(&dbus_object_);
 
-#if !defined(__BRILLO__)
+#if !defined(__ANDROID__)
   // Track permission_broker's lifetime so that we can close firewall holes
   // if/when permission_broker exits.
   permission_broker_.reset(
@@ -37,16 +37,16 @@ void FirewallService::RegisterAsync(const CompletionAction& callback) {
   permission_broker_->SetPermissionBrokerRemovedCallback(
       base::Bind(&FirewallService::OnPermissionBrokerRemoved,
                  weak_ptr_factory_.GetWeakPtr()));
-#endif  // __BRILLO__
+#endif  // __ANDROID__
 
   dbus_object_.RegisterAsync(callback);
 }
 
-#if !defined(__BRILLO__)
+#if !defined(__ANDROID__)
 void FirewallService::OnPermissionBrokerRemoved(const dbus::ObjectPath& path) {
   LOG(INFO) << "permission_broker died, plugging all firewall holes";
   iptables_.PlugAllHoles();
 }
-#endif  // __BRILLO__
+#endif  // __ANDROID__
 
 }  // namespace firewalld
diff --git a/firewall_service.h b/firewall_service.h
index 5bfb7c7..3786e4e 100644
--- a/firewall_service.h
+++ b/firewall_service.h
@@ -21,12 +21,12 @@
 #include <base/memory/weak_ptr.h>
 #include <chromeos/dbus/dbus_object.h>
 
-#if defined(__BRILLO__)
+#if defined(__ANDROID__)
 # include "dbus_bindings/org.chromium.Firewalld.h"
 #else
 # include "permission_broker/dbus-proxies.h"
 # include "firewalld/dbus_adaptor/org.chromium.Firewalld.h"
-#endif  // __BRILLO__
+#endif  // __ANDROID__
 
 #include "iptables.h"
 
@@ -45,15 +45,15 @@ class FirewallService : public org::chromium::FirewalldAdaptor {
   void RegisterAsync(const CompletionAction& callback);
 
  private:
-#if !defined(__BRILLO__)
+#if !defined(__ANDROID__)
   void OnPermissionBrokerRemoved(const dbus::ObjectPath& path);
-#endif  // __BRILLO__
+#endif  // __ANDROID__
 
   chromeos::dbus_utils::DBusObject dbus_object_;
-#if !defined(__BRILLO__)
+#if !defined(__ANDROID__)
   std::unique_ptr<org::chromium::PermissionBroker::ObjectManagerProxy>
       permission_broker_;
-#endif  // __BRILLO__
+#endif  // __ANDROID__
   IpTables iptables_;
 
   base::WeakPtrFactory<FirewallService> weak_ptr_factory_{this};
diff --git a/iptables.cc b/iptables.cc
index 23a12e1..6ab969e 100644
--- a/iptables.cc
+++ b/iptables.cc
@@ -27,7 +27,7 @@
 #include <chromeos/process.h>
 
 namespace {
-#if defined(__BRILLO__)
+#if defined(__ANDROID__)
 const char kIpTablesPath[] = "/system/bin/iptables";
 const char kIp6TablesPath[] = "/system/bin/ip6tables";
 const char kIpPath[] = "/system/bin/ip";
@@ -36,7 +36,7 @@ const char kIpTablesPath[] = "/sbin/iptables";
 const char kIp6TablesPath[] = "/sbin/ip6tables";
 const char kIpPath[] = "/bin/ip";
 const char kUnprivilegedUser[] = "nobody";
-#endif  // __BRILLO__
+#endif  // __ANDROID__
 
 const uint64_t kIpTablesCapMask =
     CAP_TO_MASK(CAP_NET_ADMIN) | CAP_TO_MASK(CAP_NET_RAW);
@@ -73,9 +73,9 @@ bool IsValidInterfaceName(const std::string& iface) {
 namespace firewalld {
 
 IpTables::IpTables() {
-#if defined(__BRILLO__)
+#if defined(__ANDROID__)
   ip6_enabled_ = false;
-#endif  // __BRILLO__
+#endif  // __ANDROID__
 }
 
 IpTables::~IpTables() {
@@ -380,11 +380,11 @@ int IpTables::ExecvNonRoot(const std::vector<std::string>& argv,
                            uint64_t capmask) {
   chromeos::Minijail* m = chromeos::Minijail::GetInstance();
   minijail* jail = m->New();
-#if !defined(__BRILLO__)
+#if !defined(__ANDROID__)
   // TODO(garnold) This needs to be re-enabled once we figure out which
   // unprivileged user we want to use.
   m->DropRoot(jail, kUnprivilegedUser, kUnprivilegedUser);
-#endif  // __BRILLO__
+#endif  // __ANDROID__
   m->UseCapabilities(jail, capmask);
 
   std::vector<char*> args;
diff --git a/iptables.h b/iptables.h
index 24544f8..ebd556d 100644
--- a/iptables.h
+++ b/iptables.h
@@ -25,11 +25,11 @@
 #include <base/macros.h>
 #include <chromeos/errors/error.h>
 
-#if defined(__BRILLO__)
+#if defined(__ANDROID__)
 # include "dbus_bindings/org.chromium.Firewalld.h"
 #else
 # include "firewalld/dbus_adaptor/org.chromium.Firewalld.h"
-#endif  // __BRILLO__
+#endif  // __ANDROID__
 
 namespace firewalld {