commit 0578e97204f3fe35bcc05fde77a4411fa470d7cd
author Steven Moreland <smoreland@google.com> Tue Jun 19 15:41:25 2018 -0700
committer Greg Hartman <ghartman@google.com> Thu Sep 13 23:01:40 2018 -0700
tree cf665f071c9c5081930cc07838bbfe49e1ba01ee
parent c4fa4f53b7736b3a15d6d9788bc61ac7c36c2eb2

Move media configs system->vendor.

These are about vendor specific things and their inclusion on
the system image meant that they weren't available when the
GSI was being used, causing this error:

06-19 17:33:41.972  2403  2403 E AndroidRuntime: java.lang.RuntimeException: Unable to start activity ComponentInfo{com.android.camera2/com.android.camera.CameraActivity}: java.lang.IllegalArgumentException: Could not find supported video qualities.

Test: boot cf normally and use camera
Test: boot cf w/ GSI (aosp_x86-userdebug's system.img) and use camera
Bug: 110064661
Change-Id: I1f1255a46ee4ef2bf38a9357cf3084a899304f23
Merged-In: I1f1255a46ee4ef2bf38a9357cf3084a899304f23

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index dbb56fb..0206ec5 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -105,14 +105,14 @@
     device/google/cuttlefish/shared/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     device/google/cuttlefish/shared/config/camera_v1.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/camera.json \
     device/google/cuttlefish/shared/config/init.vsoc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.vsoc.rc \
-    device/google/cuttlefish/shared/config/media_codecs.xml:system/etc/media_codecs.xml \
-    device/google/cuttlefish/shared/config/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \
-    device/google/cuttlefish/shared/config/media_profiles.xml:system/etc/media_profiles.xml \
+    device/google/cuttlefish/shared/config/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
+    device/google/cuttlefish/shared/config/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
+    device/google/cuttlefish/shared/config/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \
     device/google/cuttlefish/shared/config/fstab.vsoc:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.vsoc \
     frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
-    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
+    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
     frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
     frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \