| commit | 87ef34478fd709c2ec41b980ee7bbea04bf7aa3e | [log] [tgz] |
|---|---|---|
| author | Chris Weir <chrisweir@google.com> | Wed Jul 01 01:13:44 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 01 01:13:44 2020 +0000 |
| tree | dd840d9218f61f9c33963d6a714ce0542da47407 | |
| parent | d73ef0aeabc61cf83314e6959f0095d3ff0c85b2 [diff] | |
| parent | e56f9e18a6b4da753060c6c5d4d61b6cb1ef8d0b [diff] |
Merge "Export libnetdevice headers"
diff --git a/automotive/can/1.0/default/libnetdevice/include/libnetdevice/NetlinkRequest.h b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/NetlinkRequest.h index 5bea333..c19d04d 100644 --- a/automotive/can/1.0/default/libnetdevice/include/libnetdevice/NetlinkRequest.h +++ b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/NetlinkRequest.h
@@ -16,9 +16,9 @@ #pragma once -#include "types.h" - #include <android-base/macros.h> +#include <libnetdevice/types.h> + #include <linux/rtnetlink.h> #include <string>
diff --git a/automotive/can/1.0/default/libnetdevice/types.h b/automotive/can/1.0/default/libnetdevice/include/libnetdevice/types.h similarity index 100% rename from automotive/can/1.0/default/libnetdevice/types.h rename to automotive/can/1.0/default/libnetdevice/include/libnetdevice/types.h
diff --git a/automotive/can/1.0/default/libnetdevice/protocols/MessageDefinition.h b/automotive/can/1.0/default/libnetdevice/protocols/MessageDefinition.h index 00fce8c..a25e885 100644 --- a/automotive/can/1.0/default/libnetdevice/protocols/MessageDefinition.h +++ b/automotive/can/1.0/default/libnetdevice/protocols/MessageDefinition.h
@@ -16,9 +16,8 @@ #pragma once -#include "types.h" - #include <libnetdevice/nlbuf.h> +#include <libnetdevice/types.h> #include <map> #include <sstream>
diff --git a/automotive/can/1.0/default/libnetdevice/protocols/NetlinkProtocol.h b/automotive/can/1.0/default/libnetdevice/protocols/NetlinkProtocol.h index 0e1878d..7b12efa 100644 --- a/automotive/can/1.0/default/libnetdevice/protocols/NetlinkProtocol.h +++ b/automotive/can/1.0/default/libnetdevice/protocols/NetlinkProtocol.h
@@ -19,7 +19,8 @@ #include "MessageDefinition.h" #include "common/Empty.h" #include "common/Error.h" -#include "types.h" + +#include <libnetdevice/types.h> #include <string> #include <vector>