From 4252db915fa368e0d122afcf039c228d73ee01e4 Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Tue, 6 Jul 2021 17:05:16 +0000
Subject: [PATCH] Revert "Add ota_dexopt_aidl_interface"

Revert "Move otadexopt-related logic to otapreopt_chroot binary"

Revert "Allow otapreopt_chroot to call otadexopt binder service"

Revert submission 1750144-otapreopt_chroot_speed_up

Reason for revert: Breaks postinstall step on some devices
Reverted Changes:
I56dec13c8:Add ota_dexopt_aidl_interface
Ib32cbbbf8:Allow otapreopt_chroot to call otadexopt binder se...
I02e80a8e6:Move otadexopt-related logic to otapreopt_chroot b...

Bug: 190817237
Change-Id: I86845838bf16268e7b1c87bb3faa7238e7b3426d
---
 core/java/Android.bp | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/core/java/Android.bp b/core/java/Android.bp
index c0a51117659ae..874704e6350eb 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -281,26 +281,6 @@ aidl_interface {
     },
 }
 
-// Build C++ bindings for OtaDexopt services. Needed by otapreopt_chroot
-aidl_interface {
-    name: "ota_dexopt_aidl_interface",
-    unstable: true,
-    srcs: [
-        "android/content/pm/IOtaDexopt.aidl",
-    ],
-    backend: {
-        java: {
-            sdk_version: "28",
-        },
-        cpp: {
-            enabled: true,
-        },
-        ndk: {
-            enabled: false,
-        },
-    },
-}
-
 // Avoid including Parcelable classes as we don't want to have two copies of
 // Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony)
 // and TeleService app (packages/services/Telephony).