commit cffe5615f6f887221e8ca513b52f79c53e39f2b8
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 16 23:22:52 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 16 23:22:52 2020 +0000
tree 3057841000bd276c47db88ebeeb513d3126665ae
parent 86cafc59d5b09741e08b522d5ab4554d90a41c09
parent 10346271fd31f9efdcc31ab9bf265f184ec40971

Merge "multi boot.img support cleanups"

core/tasks/vts-core-tests.mk

diff --git a/core/tasks/vts-core-tests.mk b/core/tasks/vts-core-tests.mk
index 33da020..08663c2 100644
--- a/core/tasks/vts-core-tests.mk
+++ b/core/tasks/vts-core-tests.mk
@@ -28,9 +28,4 @@
 vts: $(compatibility_zip)
 $(call dist-for-goals, vts, $(compatibility_zip))
 
-# TODO(b/149249068): Remove vts-core phony target after it's removed from all
-# builders.
-.PHONY: vts-core
-vts-core: vts
-
 tests: vts

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 434cbfc..b017377 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -106,7 +106,6 @@
     installd \
     iorapd \
     ip \
-    ip6tables \
     iptables \
     ip-up-vpn \
     javax.obex \

target/product/emulated_storage.mk

diff --git a/target/product/emulated_storage.mk b/target/product/emulated_storage.mk
index 89de192..d7cc9ce 100644
--- a/target/product/emulated_storage.mk
+++ b/target/product/emulated_storage.mk
@@ -15,7 +15,7 @@
 #
 
 PRODUCT_QUOTA_PROJID := 1
-PRODUCT_PRODUCT_PROPERTIES += ro.emulated_storage.projid=1
+PRODUCT_PROPERTY_OVERRIDES += external_storage.projid.enabled=1
 
 PRODUCT_FS_CASEFOLD := 1
-PRODUCT_PRODUCT_PROPERTIES += ro.emulated_storage.casefold=1
+PRODUCT_PROPERTY_OVERRIDES += external_storage.casefold.enabled=1