From 6e1127e0046453bedc591b238ef71590b7f0e61a Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 21 Oct 2019 13:19:42 +0900
Subject: [PATCH] DO NOT MERGE Remove *.aidl for parcelable declarations from
 srcs

When an AIDL file is listed in the srcs property, the build system
expects a Java file for the AIDL file even when the AIDL file is for a
parcelable declaration. Previously, the AIDL compiler generated an empty
Java file in that case, but with Iaa9c78c5df06afee165462db05c6dc6e11a1ba8a
that is no longer the case.

Therefore, removing two AIDL files for the parcelable declarations from
the srcs property.

Note that, in master branch (for R and beyond), we don't need to
filter-out such AIDL files because the build system expects a srcjar
file from AIDL files. This change is only for Q where the build system
change doesn't exist.

Bug: 143993752
Test: m
Merged-In: I0705ddf76b3c628127f65d75e0a8b06c6c250fe2
Change-Id: Iadb82092b8f6ea12c93285e9e0af18845f0feab9
---
 Android.bp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index bf008669cd172..ec71826199039 100644
--- a/Android.bp
+++ b/Android.bp
@@ -321,7 +321,6 @@ java_defaults {
         "core/java/android/service/vr/IVrManager.aidl",
         "core/java/android/service/vr/IVrStateCallbacks.aidl",
         "core/java/android/service/watchdog/IExplicitHealthCheckService.aidl",
-        "core/java/android/service/watchdog/PackageConfig.aidl",
         "core/java/android/print/ILayoutResultCallback.aidl",
         "core/java/android/print/IPrinterDiscoveryObserver.aidl",
         "core/java/android/print/IPrintDocumentAdapter.aidl",
@@ -439,7 +438,6 @@ java_defaults {
         "core/java/com/android/internal/os/IShellCallback.aidl",
         "core/java/com/android/internal/statusbar/IStatusBar.aidl",
         "core/java/com/android/internal/statusbar/IStatusBarService.aidl",
-        "core/java/com/android/internal/statusbar/RegisterStatusBarResult.aidl",
         "core/java/com/android/internal/textservice/ISpellCheckerService.aidl",
         "core/java/com/android/internal/textservice/ISpellCheckerServiceCallback.aidl",
         "core/java/com/android/internal/textservice/ISpellCheckerSession.aidl",