Trying to work around aidl incremental build bug.
Test: builds
Bug: b/136132412
Change-Id: I7519889f6898d7604ee5416d928dc955a4f97edf
diff --git a/Android.bp b/Android.bp
index 15188ec..77abad6e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -799,11 +799,7 @@
filegroup {
name: "incremental_aidl",
srcs: [
- "core/java/android/os/incremental/IIncrementalManagerNative.aidl",
- "core/java/android/os/incremental/IIncrementalManager.aidl",
- "core/java/android/os/incremental/IncrementalDataLoaderParamsParcel.aidl",
"core/java/android/os/incremental/IncrementalFileSystemControlParcel.aidl",
- "core/java/android/os/incremental/NamedParcelFileDescriptor.aidl",
],
path: "core/java",
}
@@ -812,6 +808,17 @@
name: "dataloader_aidl",
srcs: [
"core/java/android/content/pm/IDataLoaderStatusListener.aidl",
+ "core/java/android/os/incremental/IncrementalDataLoaderParamsParcel.aidl",
+ "core/java/android/os/incremental/NamedParcelFileDescriptor.aidl",
+ ],
+ path: "core/java",
+}
+
+filegroup {
+ name: "incremental_manager_aidl",
+ srcs: [
+ "core/java/android/os/incremental/IIncrementalManager.aidl",
+ "core/java/android/os/incremental/IIncrementalManagerNative.aidl",
],
path: "core/java",
}
@@ -821,9 +828,6 @@
srcs: [
":incremental_aidl",
],
- imports: [
- "libdataloader_aidl",
- ],
backend: {
java: {
sdk_version: "28",
@@ -842,6 +846,9 @@
srcs: [
":dataloader_aidl",
],
+ imports: [
+ "libincremental_aidl",
+ ],
backend: {
java: {
sdk_version: "28",
@@ -850,8 +857,30 @@
enabled: true,
},
ndk: {
+ enabled: false,
+ },
+ },
+}
+
+aidl_interface {
+ name: "libincremental_manager_aidl",
+ srcs: [
+ ":incremental_manager_aidl",
+ ],
+ imports: [
+ "libincremental_aidl",
+ "libdataloader_aidl",
+ ],
+ backend: {
+ java: {
+ sdk_version: "28",
+ },
+ cpp: {
enabled: true,
},
+ ndk: {
+ enabled: false,
+ },
},
}