summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-08-10 00:05:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-08-10 00:05:20 +0000
commit4b77d124bfe037ac8a7b8da78b38b745887c93e3 (patch)
tree1c2af030b9da0149906b9e8628cb3e1a3e4d2b29
parentf8e76780bcecf69300bc1b3f9eb9e02e43d4ccb8 (diff)
parentcedffb4ec00b5dc9216cb7d48e375cd2ae33a5f8 (diff)
downloaddevice_google_vrservices-4b77d124bfe037ac8a7b8da78b38b745887c93e3.tar.gz
device_google_vrservices-4b77d124bfe037ac8a7b8da78b38b745887c93e3.tar.bz2
device_google_vrservices-4b77d124bfe037ac8a7b8da78b38b745887c93e3.zip
Merge "Copy XR config files to system image instead of vendor image"
-rw-r--r--xr/products/experimental_google_xr.mk7
1 files changed, 4 insertions, 3 deletions
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_PROPERTY_OVERRIDES += ro.vendor.camera.external.hal3TrebleMinorVersion=5
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 += \