From 3fb244a56ff72fbd3fb11e4d4202dffd0b466321 Mon Sep 17 00:00:00 2001 From: chrisweir Date: Mon, 29 Jun 2020 13:05:17 -0700 Subject: [PATCH] Make NetlinkSocket and nlbuf exported Move NetlinkSocket.h and nlbuf.h to include/libnetdevice as to make them available for include. Bug: 160171644 Test: Manual Change-Id: If54852398cfbcc53eb830a66685c6b44e36ced87 --- automotive/can/1.0/default/libnetdevice/NetlinkRequest.cpp | 2 +- automotive/can/1.0/default/libnetdevice/NetlinkSocket.cpp | 2 +- automotive/can/1.0/default/libnetdevice/can.cpp | 4 ++-- automotive/can/1.0/default/libnetdevice/common.h | 2 +- .../libnetdevice/{ => include/libnetdevice}/NetlinkRequest.h | 0 .../libnetdevice/{ => include/libnetdevice}/NetlinkSocket.h | 3 +-- .../default/libnetdevice/{ => include/libnetdevice}/nlbuf.h | 0 automotive/can/1.0/default/libnetdevice/libnetdevice.cpp | 4 ++-- automotive/can/1.0/default/libnetdevice/printer.cpp | 2 +- .../1.0/default/libnetdevice/protocols/MessageDefinition.h | 3 ++- automotive/can/1.0/default/libnetdevice/vlan.cpp | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) rename automotive/can/1.0/default/libnetdevice/{ => include/libnetdevice}/NetlinkRequest.h (100%) rename automotive/can/1.0/default/libnetdevice/{ => include/libnetdevice}/NetlinkSocket.h (97%) rename automotive/can/1.0/default/libnetdevice/{ => include/libnetdevice}/nlbuf.h (100%) diff --git a/automotive/can/1.0/default/libnetdevice/NetlinkRequest.cpp b/automotive/can/1.0/default/libnetdevice/NetlinkRequest.cpp index 556debfc09..4c06f7cdb4 100644 --- a/automotive/can/1.0/default/libnetdevice/NetlinkRequest.cpp +++ b/automotive/can/1.0/default/libnetdevice/NetlinkRequest.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "NetlinkRequest.h" +#include #include diff --git a/automotive/can/1.0/default/libnetdevice/NetlinkSocket.cpp b/automotive/can/1.0/default/libnetdevice/NetlinkSocket.cpp index 15c0f9b6dd..6146d5e4a4 100644 --- a/automotive/can/1.0/default/libnetdevice/NetlinkSocket.cpp +++ b/automotive/can/1.0/default/libnetdevice/NetlinkSocket.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "NetlinkSocket.h" +#include #include diff --git a/automotive/can/1.0/default/libnetdevice/can.cpp b/automotive/can/1.0/default/libnetdevice/can.cpp index 06fa8aadd2..b0a243244d 100644 --- a/automotive/can/1.0/default/libnetdevice/can.cpp +++ b/automotive/can/1.0/default/libnetdevice/can.cpp @@ -16,12 +16,12 @@ #include -#include "NetlinkRequest.h" -#include "NetlinkSocket.h" #include "common.h" #include #include +#include +#include #include #include diff --git a/automotive/can/1.0/default/libnetdevice/common.h b/automotive/can/1.0/default/libnetdevice/common.h index 1e04d4147f..b4f91bd1bb 100644 --- a/automotive/can/1.0/default/libnetdevice/common.h +++ b/automotive/can/1.0/default/libnetdevice/common.h @@ -16,7 +16,7 @@ #pragma once -#include "nlbuf.h" +#include #include #include diff --git a/automotive/can/1.0/default/libnetdevice/NetlinkRequest.h b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/NetlinkRequest.h similarity index 100% rename from automotive/can/1.0/default/libnetdevice/NetlinkRequest.h rename to automotive/can/1.0/default/libnetdevice/include/libnetdevice/NetlinkRequest.h diff --git a/automotive/can/1.0/default/libnetdevice/NetlinkSocket.h b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/NetlinkSocket.h similarity index 97% rename from automotive/can/1.0/default/libnetdevice/NetlinkSocket.h rename to automotive/can/1.0/default/libnetdevice/include/libnetdevice/NetlinkSocket.h index 595c31acf6..8900ff776f 100644 --- a/automotive/can/1.0/default/libnetdevice/NetlinkSocket.h +++ b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/NetlinkSocket.h @@ -16,10 +16,9 @@ #pragma once -#include "NetlinkRequest.h" - #include #include +#include #include diff --git a/automotive/can/1.0/default/libnetdevice/nlbuf.h b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/nlbuf.h similarity index 100% rename from automotive/can/1.0/default/libnetdevice/nlbuf.h rename to automotive/can/1.0/default/libnetdevice/include/libnetdevice/nlbuf.h diff --git a/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp b/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp index 73b91d0ee6..0545ebfa98 100644 --- a/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp +++ b/automotive/can/1.0/default/libnetdevice/libnetdevice.cpp @@ -16,12 +16,12 @@ #include -#include "NetlinkRequest.h" -#include "NetlinkSocket.h" #include "common.h" #include "ifreqs.h" #include +#include +#include #include #include diff --git a/automotive/can/1.0/default/libnetdevice/printer.cpp b/automotive/can/1.0/default/libnetdevice/printer.cpp index 8e17e7f6ad..a8715da188 100644 --- a/automotive/can/1.0/default/libnetdevice/printer.cpp +++ b/automotive/can/1.0/default/libnetdevice/printer.cpp @@ -17,10 +17,10 @@ #include #include "common.h" -#include "nlbuf.h" #include "protocols/all.h" #include +#include #include #include diff --git a/automotive/can/1.0/default/libnetdevice/protocols/MessageDefinition.h b/automotive/can/1.0/default/libnetdevice/protocols/MessageDefinition.h index 9764f8d17e..00fce8c0a4 100644 --- a/automotive/can/1.0/default/libnetdevice/protocols/MessageDefinition.h +++ b/automotive/can/1.0/default/libnetdevice/protocols/MessageDefinition.h @@ -16,9 +16,10 @@ #pragma once -#include "nlbuf.h" #include "types.h" +#include + #include #include diff --git a/automotive/can/1.0/default/libnetdevice/vlan.cpp b/automotive/can/1.0/default/libnetdevice/vlan.cpp index 82ef0d9239..f0caacdb75 100644 --- a/automotive/can/1.0/default/libnetdevice/vlan.cpp +++ b/automotive/can/1.0/default/libnetdevice/vlan.cpp @@ -16,11 +16,11 @@ #include -#include "NetlinkRequest.h" -#include "NetlinkSocket.h" #include "common.h" #include +#include +#include namespace android::netdevice::vlan {