commit 46e2831c704fdab039aa9852e589f2ecd63b9da7
author Jeongik Cha <jeongik@google.com> Tue Apr 07 14:17:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 07 14:17:53 2020 +0000
tree 7d588f7455095b6d0d03f226489acaa52a9043f2
parent 90d77ef51f9313366fd58fed2067918157c00b7b
parent e03fc8004aa1b6923c80e2940d62a0acd4a643ab

Correct include_dirs in networkstack-aidl-interfaces am: 633b2b7a61 am: e03fc8004a

Change-Id: I222633f25d8d4186742e82ef0866ce648759687e

common/networkstackclient/Android.bp

diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
index 49e9688..1610572 100644
--- a/common/networkstackclient/Android.bp
+++ b/common/networkstackclient/Android.bp
@@ -51,7 +51,7 @@
     local_include_dir: "src",
     include_dirs: [
         "frameworks/base/core/java", // For framework parcelables.
-        "frameworks/native/aidl/binder/android/os", // For PersistableBundle.aidl
+        "frameworks/native/aidl/binder", // For PersistableBundle.aidl
         "frameworks/base/wifi/aidl-export", // For wifi parcelables.
     ],
     srcs: [

common/networkstackclient/src/android/net/INetworkMonitorCallbacks.aidl

diff --git a/common/networkstackclient/src/android/net/INetworkMonitorCallbacks.aidl b/common/networkstackclient/src/android/net/INetworkMonitorCallbacks.aidl
index f57a8f7..8009a43 100644
--- a/common/networkstackclient/src/android/net/INetworkMonitorCallbacks.aidl
+++ b/common/networkstackclient/src/android/net/INetworkMonitorCallbacks.aidl
@@ -19,6 +19,7 @@
 import android.net.CaptivePortalData;
 import android.net.INetworkMonitor;
 import android.net.PrivateDnsConfigParcel;
+import android.os.PersistableBundle;
 
 /** @hide */
 oneway interface INetworkMonitorCallbacks {