diff --git a/core/definitions.mk b/core/definitions.mk
index 02fc77a..857b73c 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2859,7 +2859,8 @@
 $(call hiddenapi-soong-input-dex,$(2)): $(1)
 	@rm -rf `dirname $$@`
 	@mkdir -p `dirname $$@`
-	unzip -o -DD -q $(1) 'classes*.dex' -d `dirname $$@`
+	unzip -o -q $(1) 'classes*.dex' -d `dirname $$@`
+	find `dirname $$@` -maxdepth 1 -name 'classes*.dex' | xargs touch
 
 $(call hiddenapi-copy-dex-files,\
     $(call hiddenapi-soong-input-dex,$(2)),\
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index 80e8f53..2e161db 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -23,17 +23,14 @@
 
 _base_mk_whitelist := \
   recovery/root/etc/mke2fs.conf \
-  root/init \
-  root/init.environ.rc \
-  root/init.rc \
-  root/init.usb.configfs.rc \
-  root/init.usb.rc \
-  root/init.zygote32.rc \
-  root/sbin/charger \
-  root/ueventd.rc \
   vendor/lib/mediadrm/libdrmclearkeyplugin.so \
   vendor/lib64/mediadrm/libdrmclearkeyplugin.so \
 
 _my_whitelist := $(_base_mk_whitelist)
 
-$(call require-artifacts-in-path, $(TARGET_COPY_OUT_SYSTEM), $(_my_whitelist))
+# Both /system and / are in system.img when PRODUCT_SHIPPING_API_LEVEL>=28.
+_my_paths := \
+  $(TARGET_COPY_OUT_ROOT) \
+  $(TARGET_COPY_OUT_SYSTEM) \
+
+$(call require-artifacts-in-path, $(_my_paths), $(_my_whitelist))