From e0d3b2b51a17c047a890c68925a333807f8d0bda Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Thu, 10 Mar 2022 16:13:32 -0800
Subject: [PATCH] DO NOT MERGE Fix build: no vendor specific files in
 without-vendor

Remove vendor-specific codec config and .mk includes in
 without-vendor branch

Change-Id: Iffbd2ee10ed3485c8060f0b3e36e6730fe48fd2b
---
 device-oriole.mk             | 13 -------
 device-raven.mk              | 13 -------
 media_codecs_bo_dolby_c2.xml | 66 ------------------------------------
 3 files changed, 92 deletions(-)
 delete mode 100644 media_codecs_bo_dolby_c2.xml

diff --git a/device-oriole.mk b/device-oriole.mk
index e8fb434..e22e0b3 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -217,16 +217,3 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # This device is shipped with 31 (Android S)
 PRODUCT_SHIPPING_API_LEVEL := 31
-
-##############################################
-# DOLBY integration
-include vendor/dolby/ds/dolby-buildspec.mk
-$(call inherit-product, vendor/dolby/ds/dolby-product.mk)
-
-# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml
-# with same file but with Dolby codecs listed
-PRODUCT_COPY_FILES := \
-    device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
-    $(PRODUCT_COPY_FILES) 
-
-PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/device-raven.mk b/device-raven.mk
index 27d2fc6..4f16dc5 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -233,16 +233,3 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # This device is shipped with 31 (Android S)
 PRODUCT_SHIPPING_API_LEVEL := 31
-
-#############################################
-# DOLBY integration
-include vendor/dolby/ds/dolby-buildspec.mk
-$(call inherit-product, vendor/dolby/ds/dolby-product.mk)
-
-# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml
-# with same file but with Dolby codecs listed
-PRODUCT_COPY_FILES := \
-    device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
-    $(PRODUCT_COPY_FILES) 
-
-PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/media_codecs_bo_dolby_c2.xml b/media_codecs_bo_dolby_c2.xml
deleted file mode 100644
index 3197674..0000000
--- a/media_codecs_bo_dolby_c2.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2018 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.
--->
-<MediaCodecs>
-    <Include href="media_codecs_aosp_c2.xml" />
-    <Decoders>
-        <MediaCodec name="c2.google.av1.decoder" type="video/av01">
-          <Limit name="size" min="96x96" max="3840x2160" />
-          <Limit name="alignment" value="2x2" />
-          <Limit name="block-size" value="16x16" />
-          <Limit name="block-count" range="36-32400" />
-          <Limit name="blocks-per-second" min="24" max="1944000" />
-          <Limit name="bitrate" range="1-120000000" />
-          <Limit name="frame-rate" range="1-180" />
-          <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1280x720" value="180" />
-          <Limit name="performance-point-1920x1080" value="120" />
-          <Limit name="performance-point-3840x2160" value="60" />
-          <Feature name="adaptive-playback" />
-          <Feature name="can-swap-width-height" value="1" />
-        </MediaCodec>
-        <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
-          <Limit name="size" min="96x96" max="3840x2160" />
-          <Limit name="alignment" value="2x2" />
-          <Limit name="block-size" value="16x16" />
-          <Limit name="block-count" range="36-32400" />
-          <Limit name="blocks-per-second" min="24" max="1944000" />
-          <Limit name="bitrate" range="1-120000000" />
-          <Limit name="frame-rate" range="1-180" />
-          <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1280x720" value="180" />
-          <Limit name="performance-point-1920x1080" value="120" />
-          <Limit name="performance-point-3840x2160" value="60" />
-          <Feature name="adaptive-playback" />
-          <Feature name="secure-playback" required="true" />
-          <Feature name="can-swap-width-height" value="1" />
-        </MediaCodec>
-        <MediaCodec name="c2.dolby.eac3.decoder">
-            <Type name="audio/ac3">
-                <Alias name="OMX.dolby.ac3.decoder"/>
-                <Limit name="channel-count" max="6"/>
-                <Limit name="sample-rate" ranges="32000,44100,48000"/>
-                <Limit name="bitrate" range="32000-640000"/>
-            </Type>
-            <Attribute name="software-codec"/>
-            <Type name="audio/eac3">
-                <Alias name="OMX.dolby.eac3.decoder"/>
-                <Limit name="channel-count" max="8"/>
-                <Limit name="sample-rate" ranges="32000,44100,48000"/>
-                <Limit name="bitrate" range="32000-6144000"/>
-            </Type>
-        </MediaCodec>
-    </Decoders>
-</MediaCodecs>