aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Delva <adelva@google.com>2020-06-25 00:38:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-25 00:38:37 +0000
commit3255872a37d028aff5c14d4aa6ee45eaba6dd7ec (patch)
tree47e912ba099e579c8c6819fb9e85a879b814c877
parent129471f5e98eeebed6eff936e28ff7f61f52166e (diff)
parent19459af98a86acea3d35644c4a3af18657bf8531 (diff)
downloadcuttlefish-3255872a37d028aff5c14d4aa6ee45eaba6dd7ec.tar.gz
Merge "Enable scoped storage for ext4 as well" into rvc-dev
-rw-r--r--shared/device.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/shared/device.mk b/shared/device.mk
index a14610ed8..377db3b18 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -47,10 +47,8 @@ AB_OTA_PARTITIONS += \
# Enable Virtual A/B
$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk)
-# Enable Scoped Storage related changes for f2fs
-ifeq ($(TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE),f2fs)
+# Enable Scoped Storage related
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk)
-endif
# Properties that are not vendor-specific. These will go in the product
# partition, instead of the vendor partition, and do not need vendor