From 38a901df563218e3b33c1c643cfb4e21dc0344b1 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Tue, 15 Sep 2020 19:07:39 +0000
Subject: [PATCH] Revert "Add modules partition"

Revert submission 1413808-modules_partition

Reason for revert: modules partition no longer needed
Reverted Changes:
Iceafebd85:Add modules partition
I2fa96199a:rootdir: Add modules directory
Ie397b9ec6:Add modules partition.
I4200d0cf5:fastboot: add modules partition

Bug: 163543381

Change-Id: I613d4efa346b217e0131b14424bc340ad643e1d6
---
 private/compat/30.0/30.0.ignore.cil | 1 -
 private/file_contexts               | 7 -------
 public/file.te                      | 3 ---
 3 files changed, 11 deletions(-)

diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index 60586cc40..4dce1a64b 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -23,5 +23,4 @@
     shell_test_data_file
     sysfs_devices_cs_etm
     update_engine_stable_service
-    updateable_module_file
     userspace_reboot_metadata_file))
diff --git a/private/file_contexts b/private/file_contexts
index 8fa09bb49..27bbb3d73 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -478,13 +478,6 @@
 #
 /(odm_dlkm|vendor/odm_dlkm|system/vendor/odm_dlkm)(/.*)?                  u:object_r:vendor_file:s0
 
-#############################
-# Modules files
-# This includes updateable modules (including APEXes and APKs) that are stored
-# in the modules partition.
-#
-/modules(/.*)?      u:object_r:updateable_module_file:s0
-
 #############################
 # Vendor files from /(product|system/product)/vendor_overlay
 #
diff --git a/public/file.te b/public/file.te
index 383dea61a..3d10999b2 100644
--- a/public/file.te
+++ b/public/file.te
@@ -532,9 +532,6 @@ type hwservice_contexts_file, system_file_type, file_type;
 # vndservice_contexts file
 type vndservice_contexts_file, file_type;
 
-# /modules for updateable modules
-type updateable_module_file, file_type;
-
 # Allow files to be created in their appropriate filesystems.
 allow fs_type self:filesystem associate;
 allow cgroup tmpfs:filesystem associate;