aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Macnak <natsu@google.com>2022-02-04 11:58:01 -0800
committerAlistair Delva <adelva@google.com>2022-02-07 16:51:13 +0000
commit175f5595531122673fa7377bd0a6130ac0b905b4 (patch)
tree9199acea6373249cccf75bf593c0811934708d60
parent1bceb5408e4d34bdd4bd1142cdf31da288d75f95 (diff)
downloadcuttlefish-175f5595531122673fa7377bd0a6130ac0b905b4.tar.gz
Remove flipendo sepolicy from generic Cuttlefish
... this will be re-added for the specific flavors of Cuttlefish that actually need this. Bug: b/184857106 Test: cvd start Change-Id: I588c24f5337f5799be0fb5f889b26d27825761ea
-rw-r--r--shared/BoardConfig.mk7
-rw-r--r--shared/sepolicy/system_ext/private/flipendo.te1
2 files changed, 0 insertions, 8 deletions
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 29638745a..9b30d438f 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -159,13 +159,6 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/cuttlefish/shared/sepolicy/vendor/go
BOARD_SEPOLICY_DIRS += system/bt/vendor_libs/linux/sepolicy
-# Avoid multiple includes of sepolicy already included by Pixel experience.
-ifneq ($(filter aosp_% %_auto %_go_phone trout_% gull% %_tv,$(PRODUCT_NAME)),)
-
-SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/flipendo
-
-endif
-
# product sepolicy, allow other layers to append
PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/cuttlefish/shared/sepolicy/product/private
# PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/cuttlefish/shared/sepolicy/product/public
diff --git a/shared/sepolicy/system_ext/private/flipendo.te b/shared/sepolicy/system_ext/private/flipendo.te
deleted file mode 100644
index bdf57dcdd..000000000
--- a/shared/sepolicy/system_ext/private/flipendo.te
+++ /dev/null
@@ -1 +0,0 @@
-gpu_access(flipendo)