Merge "Snap for 5949240 from e9dfdaa239e44fef857768819176474df9b58098 to sdk-release" into sdk-release
diff --git a/dummy_arm64/BoardConfig.mk b/dummy_arm64/BoardConfig.mk
index 4ef4f87..1a132b9 100644
--- a/dummy_arm64/BoardConfig.mk
+++ b/dummy_arm64/BoardConfig.mk
@@ -27,3 +27,15 @@
TARGET_2ND_CPU_ABI2 := armeabi
include device/generic/common/mgsi/BoardConfigMgsiCommon.mk
+
+# Emulator system image is going to be used as GSI and some vendor still hasn't
+# cleaned up all device specific directories under root!
+
+# TODO(b/111434759, b/111287060) SoC specific hacks
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware
+
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
diff --git a/mgsi/mgsi_product.mk b/mgsi/mgsi_product.mk
index 830770c..2bc04b9 100644
--- a/mgsi/mgsi_product.mk
+++ b/mgsi/mgsi_product.mk
@@ -18,4 +18,26 @@
Launcher3QuickStep \
Settings \
SystemUI \
+ ModuleMetadata \
+ frameworks-base-overlays \
+ LatinIME \
+ Provision \
+# Default AOSP sounds
+$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
+
+# Additional settings used in all AOSP builds
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.config.ringtone=Ring_Synth_04.ogg \
+ ro.config.notification_sound=pixiedust.ogg \
+ ro.com.android.dataroaming=true \
+
+# Telephony:
+# Provide a APN configuration to GSI product
+PRODUCT_COPY_FILES += \
+ device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml
+
+# NFC:
+# Provide a libnfc-nci.conf to GSI product
+PRODUCT_COPY_FILES += \
+ device/generic/common/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
