Rename frozen netd AIDL API directories.
Currently, all the netd AIDL interfaces specify an api_dir of
"binder/api". This does not work because the compiler does not
support using the same api_dir for multiple aidl_interface rules.
This affects only netd_event_listener_interface and
dnsresolver_aidl_interface. netd_event_listener_interface is
unaffected because it is not yet frozen.
Test: m
Bug: 133124190
Change-Id: I42ea79194d0d3a1126fd513ed39d73fc236aaca3
diff --git a/server/Android.bp b/server/Android.bp
index d1586a2..79e0a44 100644
--- a/server/Android.bp
+++ b/server/Android.bp
@@ -5,7 +5,7 @@
srcs: [
"binder/android/net/metrics/INetdEventListener.aidl",
],
- api_dir: "binder/api",
+ api_dir: "aidl/netdeventlistener",
}
// These are used in netd_integration_test
@@ -33,7 +33,7 @@
"binder/android/net/TetherStatsParcel.aidl",
"binder/android/net/UidRangeParcel.aidl",
],
- api_dir: "binder/api",
+ api_dir: "aidl/netd",
backend: {
cpp: {
gen_log: true,
diff --git a/server/binder/api/1/android/net/INetd.aidl b/server/aidl/netd/1/android/net/INetd.aidl
similarity index 100%
rename from server/binder/api/1/android/net/INetd.aidl
rename to server/aidl/netd/1/android/net/INetd.aidl
diff --git a/server/binder/api/1/android/net/INetdUnsolicitedEventListener.aidl b/server/aidl/netd/1/android/net/INetdUnsolicitedEventListener.aidl
similarity index 100%
rename from server/binder/api/1/android/net/INetdUnsolicitedEventListener.aidl
rename to server/aidl/netd/1/android/net/INetdUnsolicitedEventListener.aidl
diff --git a/server/binder/api/1/android/net/InterfaceConfigurationParcel.aidl b/server/aidl/netd/1/android/net/InterfaceConfigurationParcel.aidl
similarity index 100%
rename from server/binder/api/1/android/net/InterfaceConfigurationParcel.aidl
rename to server/aidl/netd/1/android/net/InterfaceConfigurationParcel.aidl
diff --git a/server/binder/api/1/android/net/TetherStatsParcel.aidl b/server/aidl/netd/1/android/net/TetherStatsParcel.aidl
similarity index 100%
rename from server/binder/api/1/android/net/TetherStatsParcel.aidl
rename to server/aidl/netd/1/android/net/TetherStatsParcel.aidl
diff --git a/server/binder/api/1/android/net/UidRangeParcel.aidl b/server/aidl/netd/1/android/net/UidRangeParcel.aidl
similarity index 100%
rename from server/binder/api/1/android/net/UidRangeParcel.aidl
rename to server/aidl/netd/1/android/net/UidRangeParcel.aidl
diff --git a/server/binder/api/2/android/net/INetd.aidl b/server/aidl/netd/2/android/net/INetd.aidl
similarity index 100%
rename from server/binder/api/2/android/net/INetd.aidl
rename to server/aidl/netd/2/android/net/INetd.aidl
diff --git a/server/binder/api/2/android/net/INetdUnsolicitedEventListener.aidl b/server/aidl/netd/2/android/net/INetdUnsolicitedEventListener.aidl
similarity index 100%
rename from server/binder/api/2/android/net/INetdUnsolicitedEventListener.aidl
rename to server/aidl/netd/2/android/net/INetdUnsolicitedEventListener.aidl
diff --git a/server/binder/api/2/android/net/InterfaceConfigurationParcel.aidl b/server/aidl/netd/2/android/net/InterfaceConfigurationParcel.aidl
similarity index 100%
rename from server/binder/api/2/android/net/InterfaceConfigurationParcel.aidl
rename to server/aidl/netd/2/android/net/InterfaceConfigurationParcel.aidl
diff --git a/server/binder/api/2/android/net/TetherStatsParcel.aidl b/server/aidl/netd/2/android/net/TetherStatsParcel.aidl
similarity index 100%
rename from server/binder/api/2/android/net/TetherStatsParcel.aidl
rename to server/aidl/netd/2/android/net/TetherStatsParcel.aidl
diff --git a/server/binder/api/2/android/net/UidRangeParcel.aidl b/server/aidl/netd/2/android/net/UidRangeParcel.aidl
similarity index 100%
rename from server/binder/api/2/android/net/UidRangeParcel.aidl
rename to server/aidl/netd/2/android/net/UidRangeParcel.aidl