Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57d1b244 authored by Android Code Review's avatar Android Code Review
Browse files

Merge change 9452 

* changes:
  Ensure that /system/etc/vold.conf is created in the "generic" product. This is necessary to let the emulator mount SD Card images properly through the "vold" mounting daemon
parents 19ea2a88 ff2c9deb

core/main.mk

+8 −0
Original line number Diff line number Diff line
@@ -209,6 +209,14 @@ ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES))) 
    $(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)),)