commit 537992a84e39d132ff487ee1ad165a8b16393ec2
author Robin Lee <rgl@google.com> Mon Jan 25 19:34:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 25 19:34:14 2021 +0000
tree e323e0175c1ed97c883d74da8962c0ba47bf560d
parent bdb1cecf57f4ce313d1dfc85cb098e5cd2dc48b8
parent 22180b9bf0cf6b3aafcce1a9d81f0486c2b734cb

Merge "Revert "Remove device/google/atv/overlay""

hikey960.mk

diff --git a/hikey960.mk b/hikey960.mk
index 76a5672..09c5a7f 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -50,11 +50,13 @@
   HIKEY_MODS := $(wildcard $(HIKEY_MOD_DIR)/*.ko)
   SDCARDFS_KO := $(wildcard $(HIKEY_MOD_DIR)/sdcardfs*.ko)
   CMA_HEAP_KO := $(wildcard $(HIKEY_MOD_DIR)/cma_heap.ko)
+  SYSTEM_HEAP_KO := $(wildcard $(HIKEY_MOD_DIR)/system_heap.ko)
   ION_CMA_HEAP_KO := $(wildcard $(HIKEY_MOD_DIR)/ion_cma_heap*.ko)
   ifneq ($(HIKEY_MODS),)
     BOARD_VENDOR_KERNEL_MODULES += $(HIKEY_MODS)
     BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
         $(CMA_HEAP_KO) \
+        $(SYSTEM_HEAP_KO) \
         $(ION_CMA_HEAP_KO) \
         $(SDCARDFS_KO)
   endif

sepolicy/property_contexts

diff --git a/sepolicy/property_contexts b/sepolicy/property_contexts
deleted file mode 100644
index 3a4bde3..0000000
--- a/sepolicy/property_contexts
+++ /dev/null
@@ -1 +0,0 @@
-sensors.                   u:object_r:sensors_prop:s0