summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2020-10-01 20:35:49 +0000
committerSteven Moreland <smoreland@google.com>2020-10-01 21:17:52 +0000
commit844bd1dd1eddbaee62f720b4df5e732da2ee0fed (patch)
tree0197b988910926efc29861641545eeed550122ee
parent1fa847ad642bd91ffe1d1e443b73976f776a7356 (diff)
Move AIDL files to declared packages.
There was a regression in the AIDL compiler recently that removed the requirement that, like in Java, .aidl unstructured parcelables (these parcelable declarations) are in directories and files which match their packages and file names. This CL moves relevant files to the correct directory required by their type. Bug: N/A Test: build Change-Id: I71f6f714e98e184a02b6bbf3d4f8b0b8c8aee30b
-rw-r--r--core/java/com/android/ims/internal/uce/presence/PresCmdID.aidl (renamed from core/java/com/android/ims/internal/uce/presence/PresCmdId.aidl)0
-rw-r--r--wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl2
-rw-r--r--wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl2
3 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/ims/internal/uce/presence/PresCmdId.aidl b/core/java/com/android/ims/internal/uce/presence/PresCmdID.aidl
index 6ece045ffcf7..6ece045ffcf7 100644
--- a/core/java/com/android/ims/internal/uce/presence/PresCmdId.aidl
+++ b/core/java/com/android/ims/internal/uce/presence/PresCmdID.aidl
diff --git a/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl b/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl
index cf2cb4ae5eb4..57055f78d03d 100644
--- a/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl
+++ b/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-package android.net.wifi.p2p.servicediscovery;
+package android.net.wifi.p2p.nsd;
parcelable WifiP2pServiceInfo;
diff --git a/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl b/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl
index d5a1e8f505a9..e4d28bb2d39f 100644
--- a/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl
+++ b/wifi/aidl-export/android/net/wifi/p2p/nsd/WifiP2pServiceRequest.aidl
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-package android.net.wifi.p2p.servicediscovery;
+package android.net.wifi.p2p.nsd;
parcelable WifiP2pServiceRequest;