Merge "Add NfcNci to default builds." into oc-dev
diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk
index 6448d9a..5f55728 100644
--- a/target/product/aosp_arm64_ab.mk
+++ b/target/product/aosp_arm64_ab.mk
@@ -22,11 +22,6 @@
PRODUCT_COPY_FILES := \
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml
-# TODO(jiyong): remove sailfish/marlin rc files. They should be in
-# /vendor/etc/init after b/35269867
-PRODUCT_COPY_FILES += \
- device/google/marlin/init.recovery.common.rc:root/init.recovery.sailfish.rc \
-
PRODUCT_COPY_FILES += \
device/google/marlin/init.recovery.common.rc:root/init.recovery.marlin.rc \
@@ -34,10 +29,6 @@
PRODUCT_COPY_FILES += \
vendor/google/products/marlin/bootanimation-1440-256col.zip:system/media/bootanimation.zip
-# TODO(jiyong): remove this marlin-specific overlay when b/35742444 is fixed.
-PRODUCT_PACKAGE_OVERLAYS := \
- device/google/marlin/overlay
-
#split selinux policy
PRODUCT_FULL_TREBLE_OVERRIDE := true
diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index 6a21687..940ecfb 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -93,10 +93,12 @@
nonplat_property_contexts \
nonplat_seapp_contexts \
nonplat_service_contexts \
+ nonplat_hwservice_contexts \
plat_mac_permissions.xml \
plat_property_contexts \
plat_seapp_contexts \
plat_service_contexts \
+ plat_hwservice_contexts \
selinux_policy \
vndservice_contexts