Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."
This reverts commit ff2c9deb7966f79572d502a7048a3e6f0f9939b8.
This breaks SD cards on the device (always installs the emulator vold.conf)
diff --git a/core/main.mk b/core/main.mk
index aa7fcdb..df1b906 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -263,14 +263,6 @@
$(warning implicitly installing apns-conf_sdk.xml)
endif
endif
-# Install a vold.conf file is one's not already being installed.
-ifeq (,$(filter %:system/etc/vold.conf, $(PRODUCT_COPY_FILES)))
- PRODUCT_COPY_FILES += \
- development/data/etc/vold.conf:system/etc/vold.conf
- ifeq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
- $(warning implicitly installing vold.conf)
- endif
-endif
# If we're on an eng or tests build, but not on the sdk, and we have
# a better one, use that instead.
ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)