Move modules-utils to single java source path. am: e682916114

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/1650129

Change-Id: Ied94945b0c9e453bac2a0576d92981bb0715f434

11 files changed, 41 insertions, 16 deletions

diff --git a/java/Android.bp b/java/Android.bp
new file mode 100644
index 0000000..f73e180
--- /dev/null
+++ b/java/Android.bp
@@ -0,0 +1,33 @@
+//
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+// TODO(b/183183152) This build rule should really be alongside the source in
+// com/android/modules/utils/ but cannot be due to b/183183152
+filegroup {
+    name: "module-utils-os-aidls",
+    srcs: [
+        "com/android/modules/utils/ParceledListSlice.aidl",
+        "com/android/modules/utils/StringParceledListSlice.aidl",
+    ],
+    visibility: [
+        "//frameworks/base/wifi",
+        "//packages/modules/Wifi/framework",
+        "//frameworks/libs/modules-utils/java/com/android/modules/utils",
+    ],
+}
diff --git a/os/Android.bp b/java/com/android/modules/utils/Android.bp
index 88486e3..3e5563d 100644
--- a/os/Android.bp
+++ b/java/com/android/modules/utils/Android.bp
@@ -18,10 +18,15 @@ package {
 }
 
 java_library {
+    // TODO this rule should be split into smaller, more focused ones,
+    // ideally each would have its own java package too.
     name: "modules-utils-os",
     srcs: [
-        "java/**/*.aidl",
-        "java/**/*.java",
+        ":module-utils-os-aidls",
+        "BaseParceledListSlice.java",
+        "BasicShellCommandHandler.java",
+        "ParceledListSlice.java",
+        "StringParceledListSlice.java",
     ],
     sdk_version: "module_current",
     min_sdk_version: "30",
@@ -31,16 +36,3 @@ java_library {
         "//apex_available:platform",
     ],
 }
-
-filegroup {
-    name: "module-utils-os-aidls",
-    srcs: [
-        "java/com/android/modules/utils/ParceledListSlice.aidl",
-        "java/com/android/modules/utils/StringParceledListSlice.aidl",
-    ],
-    path: "java",
-    visibility: [
-        "//frameworks/base/wifi",
-        "//packages/modules/Wifi/framework",
-    ],
-}
diff --git a/os/java/com/android/modules/utils/BaseParceledListSlice.java b/java/com/android/modules/utils/BaseParceledListSlice.java
index 86f06be..86f06be 100644
--- a/os/java/com/android/modules/utils/BaseParceledListSlice.java
+++ b/java/com/android/modules/utils/BaseParceledListSlice.java
diff --git a/os/java/com/android/modules/utils/BasicShellCommandHandler.java b/java/com/android/modules/utils/BasicShellCommandHandler.java
index 32e6f79..32e6f79 100644
--- a/os/java/com/android/modules/utils/BasicShellCommandHandler.java
+++ b/java/com/android/modules/utils/BasicShellCommandHandler.java
diff --git a/os/java/com/android/modules/utils/ParceledListSlice.aidl b/java/com/android/modules/utils/ParceledListSlice.aidl
index bbe8e2c..bbe8e2c 100644
--- a/os/java/com/android/modules/utils/ParceledListSlice.aidl
+++ b/java/com/android/modules/utils/ParceledListSlice.aidl
diff --git a/os/java/com/android/modules/utils/ParceledListSlice.java b/java/com/android/modules/utils/ParceledListSlice.java
index 24a85d8..24a85d8 100644
--- a/os/java/com/android/modules/utils/ParceledListSlice.java
+++ b/java/com/android/modules/utils/ParceledListSlice.java
diff --git a/os/java/com/android/modules/utils/StringParceledListSlice.aidl b/java/com/android/modules/utils/StringParceledListSlice.aidl
index 83b9711..83b9711 100644
--- a/os/java/com/android/modules/utils/StringParceledListSlice.aidl
+++ b/java/com/android/modules/utils/StringParceledListSlice.aidl
diff --git a/os/java/com/android/modules/utils/StringParceledListSlice.java b/java/com/android/modules/utils/StringParceledListSlice.java
index 4c688a8..4c688a8 100644
--- a/os/java/com/android/modules/utils/StringParceledListSlice.java
+++ b/java/com/android/modules/utils/StringParceledListSlice.java
diff --git a/os/tests/Android.bp b/javatests/com/android/modules/utils/Android.bp
index 8df4add..2d48dd4 100644
--- a/os/tests/Android.bp
+++ b/javatests/com/android/modules/utils/Android.bp
@@ -9,7 +9,7 @@ android_test {
     min_sdk_version: "30",
 
     srcs: [
-        "src/**/*.java",
+        "*.java",
     ],
 
     static_libs: [
diff --git a/os/tests/AndroidManifest.xml b/javatests/com/android/modules/utils/AndroidManifest.xml
index 8fdfba3..8fdfba3 100644
--- a/os/tests/AndroidManifest.xml
+++ b/javatests/com/android/modules/utils/AndroidManifest.xml
diff --git a/os/tests/src/com/android/modules/utils/ParceledListSliceTest.java b/javatests/com/android/modules/utils/ParceledListSliceTest.java
index c1457d6..c1457d6 100644
--- a/os/tests/src/com/android/modules/utils/ParceledListSliceTest.java
+++ b/javatests/com/android/modules/utils/ParceledListSliceTest.java