From 2c18c1f721b7927f9d8a804677882c4089255f40 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Tue, 12 Dec 2017 18:06:35 -0800
Subject: [PATCH] Remove PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE

Replace it with FCM Version = 2, specified explicitly
in device manifest.

Test: builds
Bug: 69636193

Change-Id: I0f5689344bb7b10b2b5db2549e95c940c4812f9d
---
 device.mk    | 1 -
 manifest.xml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index a36292b0..085e626e 100755
--- a/device.mk
+++ b/device.mk
@@ -53,7 +53,6 @@ endif
 
 PRODUCT_CHARACTERISTICS := nosdcard
 PRODUCT_SHIPPING_API_LEVEL := 26
-PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE := 27
 
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
diff --git a/manifest.xml b/manifest.xml
index 1a3aca83..1af6c6f5 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device">
+<manifest version="1.0" type="device" target-level="2">
     <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>