Snap for 6793271 from 8545a09792065fa7c340be8fe129933f54efd2c4 to rvc-qpr1-release
Change-Id: Iad678bdcf618bd8206506d2dd58e4a3d568d4de7
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 0b37311..f3eb584 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,6 +17,7 @@
PRODUCT_MAKEFILES := \
aosp_cf_arm64_auto:$(LOCAL_DIR)/vsoc_arm64/auto/aosp_cf.mk \
aosp_cf_arm64_phone:$(LOCAL_DIR)/vsoc_arm64/phone/aosp_cf.mk \
+ aosp_cf_x86_64_auto:$(LOCAL_DIR)/vsoc_x86_64/auto/device.mk \
aosp_cf_x86_64_phone:$(LOCAL_DIR)/vsoc_x86_64/phone/aosp_cf.mk \
aosp_cf_x86_auto:$(LOCAL_DIR)/vsoc_x86/auto/device.mk \
aosp_cf_x86_pasan:$(LOCAL_DIR)/vsoc_x86/pasan/aosp_cf.mk \
diff --git a/shared/device.mk b/shared/device.mk
index 3e8a93c..72e27d7 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -78,10 +78,6 @@
PRODUCT_PROPERTY_OVERRIDES += \
wlan.driver.status=ok
-# Codec 2.0 is unstable on x86
-PRODUCT_PROPERTY_OVERRIDES += \
- debug.stagefright.ccodec=0
-
# Enforce privapp-permissions whitelist.
PRODUCT_PROPERTY_OVERRIDES += ro.control_privapp_permissions=enforce
diff --git a/vsoc_x86_64/auto/OWNERS b/vsoc_x86_64/auto/OWNERS
new file mode 100644
index 0000000..1b990ef
--- /dev/null
+++ b/vsoc_x86_64/auto/OWNERS
@@ -0,0 +1,5 @@
+# Android Auto leads
+ankitarora@google.com
+egranata@google.com
+gurunagarajan@google.com
+keunyoung@google.com
diff --git a/vsoc_x86_64/auto/device.mk b/vsoc_x86_64/auto/device.mk
new file mode 100644
index 0000000..5c90ecc
--- /dev/null
+++ b/vsoc_x86_64/auto/device.mk
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2020 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
+$(call inherit-product, device/google/cuttlefish/shared/auto/device.mk)
+$(call inherit-product, device/google/cuttlefish/vsoc_x86_64/device.mk)
+
+PRODUCT_NAME := aosp_cf_x86_64_auto
+PRODUCT_DEVICE := vsoc_x86_64
+PRODUCT_MODEL := Cuttlefish x86_64 auto
