Revert "Add microdroid_vendor"
Revert "Build sepolicy files for microdroid_vendor"
Revert submission 1609095-microdroid_vendor
Reason for revert: Breaks aosp_x86_64-userdebug build
Reverted Changes:
I82a66a00a:Add microdroid_vendor
I88eec6e1f:Build sepolicy files for microdroid_vendor
Bug: 180986662
Change-Id: Ifdbb43b5b8fc51107d86fa2a3f50ae18d088b704
Fixes: 181756343
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index ac6e055..d0c6675 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -92,27 +92,6 @@
installable: false, // avoid collision with system partition's init.rc
}
-android_filesystem {
- name: "microdroid_vendor",
- use_avb: true,
- deps: [
- "microdroid_plat_sepolicy_vers.txt",
- "microdroid_vendor_sepolicy.cil",
- "microdroid_plat_pub_versioned.cil",
- ],
- avb_private_key: "microdroid.pem",
- avb_algorithm: "SHA256_RSA4096",
- file_contexts: "microdroid_vendor_file_contexts",
-}
-
-prebuilt_etc {
- name: "microdroid_plat_sepolicy_vers.txt",
- src: "plat_sepolicy_vers.txt",
- filename: "plat_sepolicy_vers.txt",
- sub_dir: "selinux",
- installable: false,
-}
-
logical_partition {
name: "microdroid_super",
sparse: true,
@@ -128,10 +107,6 @@
name: "system",
filesystem: ":microdroid",
},
- {
- name: "vendor",
- filesystem: ":microdroid_vendor",
- },
],
},
],
diff --git a/microdroid/fstab b/microdroid/fstab
index 129718e..494f5b4 100644
--- a/microdroid/fstab
+++ b/microdroid/fstab
@@ -1,2 +1 @@
system /system ext4 noatime,ro,errors=panic wait,first_stage_mount,logical
-vendor /vendor ext4 noatime,ro,errors=panic wait,first_stage_mount,logical
diff --git a/microdroid/microdroid_vendor_file_contexts b/microdroid/microdroid_vendor_file_contexts
deleted file mode 100644
index 7405f1a..0000000
--- a/microdroid/microdroid_vendor_file_contexts
+++ /dev/null
@@ -1,36 +0,0 @@
-# TODO(jiyong): clean this up
-#############################
-# Vendor files
-#
-(/.*)? u:object_r:vendor_file:s0
-/bin/sh u:object_r:vendor_shell_exec:s0
-/bin/toybox_vendor u:object_r:vendor_toolbox_exec:s0
-/bin/toolbox u:object_r:vendor_toolbox_exec:s0
-/etc(/.*)? u:object_r:vendor_configs_file:s0
-/etc/cgroups\.json u:object_r:vendor_cgroup_desc_file:s0
-/etc/task_profiles\.json u:object_r:vendor_task_profiles_file:s0
-
-/lib(64)?/egl(/.*)? u:object_r:same_process_hal_file:s0
-
-/lib(64)?/vndk-sp(/.*)? u:object_r:vndk_sp_file:s0
-
-/manifest\.xml u:object_r:vendor_configs_file:s0
-/compatibility_matrix\.xml u:object_r:vendor_configs_file:s0
-/etc/vintf(/.*)? u:object_r:vendor_configs_file:s0
-/app(/.*)? u:object_r:vendor_app_file:s0
-/priv-app(/.*)? u:object_r:vendor_app_file:s0
-/overlay(/.*)? u:object_r:vendor_overlay_file:s0
-/framework(/.*)? u:object_r:vendor_framework_file:s0
-
-/apex(/[^/]+){0,2} u:object_r:vendor_apex_file:s0
-/bin/misc_writer u:object_r:vendor_misc_writer_exec:s0
-/bin/boringssl_self_test(32|64) u:object_r:vendor_boringssl_self_test_exec:s0
-
-# HAL location
-/lib(64)?/hw u:object_r:vendor_hal_file:s0
-
-/etc/selinux/nonplat_service_contexts u:object_r:nonplat_service_contexts_file:s0
-
-/etc/selinux/vendor_service_contexts u:object_r:vendor_service_contexts_file:s0
-
-/bin/install-recovery\.sh u:object_r:vendor_install_recovery_exec:s0
diff --git a/microdroid/plat_sepolicy_vers.txt b/microdroid/plat_sepolicy_vers.txt
deleted file mode 100644
index 36c9030..0000000
--- a/microdroid/plat_sepolicy_vers.txt
+++ /dev/null
@@ -1 +0,0 @@
-10000.0