From 5c55d72c6bdc709e90e3bf7dbf9af5e13cfd3c43 Mon Sep 17 00:00:00 2001
From: Eric Jeong <ericjeong@google.com>
Date: Mon, 14 Feb 2022 23:38:54 -0800
Subject: [PATCH] Remove iorapd from base product packages

- iorapd is being removed.
- So, it cannot be installed.

Bug: 211461392
Test: build okay
Change-Id: I17491f42ca7a0b73de0b3a3c588a90c8e3e3f3e9
Merged-In: I17491f42ca7a0b73de0b3a3c588a90c8e3e3f3e9
(cherry picked from commit 4c0ac42c0601fb9cb1524f78565a2fcffdf5dde1)
---
 target/product/base_system.mk    |  1 -
 target/product/runtime_libart.mk | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 55047dff6b..5fe1021380 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -118,7 +118,6 @@ PRODUCT_PACKAGES += \
     init_system \
     input \
     installd \
-    iorapd \
     ip \
     iptables \
     ip-up-vpn \
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index ee63757c95..b6560fc8f3 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -148,17 +148,6 @@ PRODUCT_SYSTEM_PROPERTIES += \
     dalvik.vm.minidebuginfo=true \
     dalvik.vm.dex2oat-minidebuginfo=true
 
-# Two other device configs are added to IORap besides "ro.iorapd.enable".
-# IORap by default is off and starts when
-# (https://source.corp.google.com/android/system/iorap/iorapd.rc?q=iorapd.rc)
-#
-# * "ro.iorapd.enable" is true excluding unset
-# * One of the device configs is true.
-#
-# "ro.iorapd.enable" has to be set to true, so that iorap can be started.
-PRODUCT_SYSTEM_PROPERTIES += \
-    ro.iorapd.enable?=true
-
 # Enable Madvising of the whole art, odex and vdex files to MADV_WILLNEED.
 # The size specified here is the size limit of how much of the file
 # (in bytes) is madvised.