Copy XR config files to system image instead of vendor image
Bug: 137033145
Test: Build and flash gsi_xr
Change-Id: I1ec711c43a4740db25560d038691eac382d7df10
diff --git a/xr/products/experimental_google_xr.mk b/xr/products/experimental_google_xr.mk
index f05c35b..2f3c1a1 100644
--- a/xr/products/experimental_google_xr.mk
+++ b/xr/products/experimental_google_xr.mk
@@ -1,5 +1,5 @@
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
- ro.dvr.lens_metrics=vendor/etc/hmd_config
+ ro.dvr.lens_metrics=/etc/hmd_config
# SELinux permissions
BOARD_SEPOLICY_DIRS += device/google/vrservices/xr/sepolicy
@@ -33,9 +33,10 @@
PRODUCT_PACKAGES += NonXrProductPackagesRemover
PRODUCT_COPY_FILES += \
- vendor/unbundled_google/packages/PrebuiltGoogleVr/configs/daydream_viewer_config:$(TARGET_COPY_OUT_VENDOR)/etc/hmd_config \
- vendor/unbundled_google/packages/PrebuiltGoogleVr/scripts/boot-to-vr.sh:$(TARGET_COPY_OUT_VENDOR)/bin/boot-to-vr.sh \
device/google/vrservices/xr/init/init.xr.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/init.xr.rc \
+ frameworks/native/data/etc/android.hardware.vr.high_performance.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.hardware.vr.high_performance.xml \
+ vendor/unbundled_google/packages/PrebuiltGoogleVr/configs/daydream_viewer_config:$(TARGET_COPY_OUT_SYSTEM)/etc/hmd_config \
+ vendor/unbundled_google/packages/PrebuiltGoogleVr/scripts/boot-to-vr.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/boot-to-vr.sh \
# XR/VR prebuilt packages
PRODUCT_PACKAGES += \