commit 32e6d0e7fb7790c83571052f3bce6ae859e8f352
author Vineeta Srivastava <vsrivastava@google.com> Fri Mar 20 23:51:36 2015 +0000
committer Vineeta Srivastava <vsrivastava@google.com> Fri Mar 20 23:51:36 2015 +0000
tree 54984a4181a5aa6e3615e4d98209829fecbee62c
parent 2b5358db29a7181452eb485ef4b263d6aa54d45c

Revert "Sigh, more vendors linking against hidden APIs."

This reverts commit 31837298166e678d8e9c9fba1b30aea5abf1350f.

Change-Id: I5c041d7438b64c4c258c414ca9a133075999e1b6

include/sysutils/NetlinkEvent.h

diff --git a/include/sysutils/NetlinkEvent.h b/include/sysutils/NetlinkEvent.h
index a428d37..b80f3ea 100644
--- a/include/sysutils/NetlinkEvent.h
+++ b/include/sysutils/NetlinkEvent.h
@@ -44,19 +44,6 @@
     char *mParams[NL_PARAMS_MAX];
 
 public:
-    // STOPSHIP: remove these deprecated constants once we have updated prebuilts
-    const static int NlActionUnknown;
-    const static int NlActionAdd;
-    const static int NlActionRemove;
-    const static int NlActionChange;
-    const static int NlActionLinkDown;
-    const static int NlActionLinkUp;
-    const static int NlActionAddressUpdated;
-    const static int NlActionAddressRemoved;
-    const static int NlActionRdnss;
-    const static int NlActionRouteUpdated;
-    const static int NlActionRouteRemoved;
-
     NetlinkEvent();
     virtual ~NetlinkEvent();
 

libsysutils/src/NetlinkEvent.cpp

diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp
index 29a86d8..ef30017 100644
--- a/libsysutils/src/NetlinkEvent.cpp
+++ b/libsysutils/src/NetlinkEvent.cpp
@@ -47,19 +47,6 @@
 #include <netlink/handlers.h>
 #include <netlink/msg.h>
 
-// STOPSHIP: remove these deprecated constants once we have updated prebuilts
-const int NetlinkEvent::NlActionUnknown = static_cast<int>(Action::kUnknown);
-const int NetlinkEvent::NlActionAdd = static_cast<int>(Action::kAdd);
-const int NetlinkEvent::NlActionRemove = static_cast<int>(Action::kRemove);
-const int NetlinkEvent::NlActionChange = static_cast<int>(Action::kChange);
-const int NetlinkEvent::NlActionLinkDown = static_cast<int>(Action::kLinkDown);
-const int NetlinkEvent::NlActionLinkUp = static_cast<int>(Action::kLinkUp);
-const int NetlinkEvent::NlActionAddressUpdated = static_cast<int>(Action::kAddressUpdated);
-const int NetlinkEvent::NlActionAddressRemoved = static_cast<int>(Action::kAddressRemoved);
-const int NetlinkEvent::NlActionRdnss = static_cast<int>(Action::kRdnss);
-const int NetlinkEvent::NlActionRouteUpdated = static_cast<int>(Action::kRouteUpdated);
-const int NetlinkEvent::NlActionRouteRemoved = static_cast<int>(Action::kRouteRemoved);
-
 NetlinkEvent::NetlinkEvent() {
     mAction = Action::kUnknown;
     memset(mParams, 0, sizeof(mParams));