diff options
| author | Maciej Żenczykowski <maze@google.com> | 2022-06-16 04:48:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-16 04:48:13 +0000 |
| commit | 86e238d65fbf3fa1d89125794cffd220b48829a2 (patch) | |
| tree | 47174402726155e5ebed4f4776c2f4aac56caa0d | |
| parent | f9508efcc86fbe579973b83ac812bb607e4e41c6 (diff) | |
| parent | e3ea09c60fdc7be99589299d12291d9f124d3f0c (diff) | |
| download | netd-86e238d65fbf3fa1d89125794cffd220b48829a2.tar.gz | |
move XtBpfProgLocations.h into a new header library am: e3ea09c60f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/netd/+/18921803
Change-Id: Icfb908904490105a306671c2dbfd92636823dfb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 9 | ||||
| -rw-r--r-- | include/mainline/XtBpfProgLocations.h (renamed from include/binder_utils/XtBpfProgLocations.h) | 0 | ||||
| -rw-r--r-- | server/BandwidthControllerTest.cpp | 2 | ||||
| -rw-r--r-- | server/TetherController.h | 2 |
4 files changed, 11 insertions, 2 deletions
@@ -29,6 +29,15 @@ cc_library_headers { apex_available: [ "//apex_available:platform", "com.android.resolv", + ], + min_sdk_version: "29", +} + +cc_library_headers { + name: "netd_mainline_headers", + export_include_dirs: ["include/mainline"], + apex_available: [ + "//apex_available:platform", "com.android.tethering", ], sdk_version: "29", diff --git a/include/binder_utils/XtBpfProgLocations.h b/include/mainline/XtBpfProgLocations.h index 95a5742c..95a5742c 100644 --- a/include/binder_utils/XtBpfProgLocations.h +++ b/include/mainline/XtBpfProgLocations.h diff --git a/server/BandwidthControllerTest.cpp b/server/BandwidthControllerTest.cpp index bf4c2e2a..844681d0 100644 --- a/server/BandwidthControllerTest.cpp +++ b/server/BandwidthControllerTest.cpp @@ -34,7 +34,7 @@ #include "BandwidthController.h" #include "Fwmark.h" #include "IptablesBaseTest.h" -#include "binder_utils/XtBpfProgLocations.h" +#include "mainline/XtBpfProgLocations.h" #include "tun_interface.h" using ::testing::_; diff --git a/server/TetherController.h b/server/TetherController.h index bbabcee4..d2195f23 100644 --- a/server/TetherController.h +++ b/server/TetherController.h @@ -31,7 +31,7 @@ #include "android/net/TetherOffloadRuleParcel.h" -#include "binder_utils/XtBpfProgLocations.h" +#include "mainline/XtBpfProgLocations.h" namespace android { namespace net { |