Merge "Snap for 5798008 from 052b9d6ef3a1d0f318ec9c9638fd479f506bc6d3 to sdk-release" into sdk-releaseplatform-tools-29.0.4platform-tools-29.0.3

1 files changed, 4 insertions, 10 deletions

diff --git a/Android.bp b/Android.bp
index 3dd8f09..6034006 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,8 +15,10 @@
 filegroup {
     name: "opt-net-voip-srcs",
     srcs: [
-        "src/java/android/net/**/*.java",
+        "src/java/**/*.java",
+        "src/java/**/I*.aidl",
     ],
+    path: "src/java",
 }
 
 filegroup {
@@ -29,14 +31,6 @@ filegroup {
 java_library {
     name: "voip-common",
     installable: true,
-    srcs: [
-        "src/java/**/*.java",
-        "src/java/**/I*.aidl",
-    ],
-    aidl: {
-        local_include_dirs: [
-            "src/java",
-        ],
-    },
+    srcs: [":opt-net-voip-srcs"],
     required: ["librtp_jni"],
 }