From 995f45e30ef88d622bebe7370e3e5ac4b5c45b20 Mon Sep 17 00:00:00 2001 From: Vineeta Srivastava Date: Fri, 20 Mar 2015 23:51:36 +0000 Subject: [PATCH] Revert "Sigh, more vendors linking against hidden APIs." This reverts commit 31837298166e678d8e9c9fba1b30aea5abf1350f. Change-Id: I5c041d7438b64c4c258c414ca9a133075999e1b6 --- include/sysutils/NetlinkEvent.h | 13 ------------- libsysutils/src/NetlinkEvent.cpp | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/include/sysutils/NetlinkEvent.h b/include/sysutils/NetlinkEvent.h index a428d37bb..b80f3ea44 100644 --- a/include/sysutils/NetlinkEvent.h +++ b/include/sysutils/NetlinkEvent.h @@ -44,19 +44,6 @@ private: 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(); diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp index 29a86d82a..ef3001743 100644 --- a/libsysutils/src/NetlinkEvent.cpp +++ b/libsysutils/src/NetlinkEvent.cpp @@ -47,19 +47,6 @@ const int LOCAL_NFLOG_PACKET = NFNL_SUBSYS_ULOG << 8 | NFULNL_MSG_PACKET; #include #include -// STOPSHIP: remove these deprecated constants once we have updated prebuilts -const int NetlinkEvent::NlActionUnknown = static_cast(Action::kUnknown); -const int NetlinkEvent::NlActionAdd = static_cast(Action::kAdd); -const int NetlinkEvent::NlActionRemove = static_cast(Action::kRemove); -const int NetlinkEvent::NlActionChange = static_cast(Action::kChange); -const int NetlinkEvent::NlActionLinkDown = static_cast(Action::kLinkDown); -const int NetlinkEvent::NlActionLinkUp = static_cast(Action::kLinkUp); -const int NetlinkEvent::NlActionAddressUpdated = static_cast(Action::kAddressUpdated); -const int NetlinkEvent::NlActionAddressRemoved = static_cast(Action::kAddressRemoved); -const int NetlinkEvent::NlActionRdnss = static_cast(Action::kRdnss); -const int NetlinkEvent::NlActionRouteUpdated = static_cast(Action::kRouteUpdated); -const int NetlinkEvent::NlActionRouteRemoved = static_cast(Action::kRouteRemoved); - NetlinkEvent::NetlinkEvent() { mAction = Action::kUnknown; memset(mParams, 0, sizeof(mParams));