From ffc7cfae5d8cf625926f9836a0087b50f02b680b Mon Sep 17 00:00:00 2001
From: Roopesh Rajashekharaiah Nataraja <roopeshr@codeaurora.org>
Date: Wed, 7 Nov 2018 12:52:09 -0800
Subject: [PATCH] Do not override Camera2 for targets using vanilla AOSP

Change-Id: Ie4d15d2c4e214dc6053c8ba3c98a6742f7f4e409
---
 Android.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Android.mk b/Android.mk
index ba490b2e3..89e09ea09 100755
--- a/Android.mk
+++ b/Android.mk
@@ -32,7 +32,10 @@ LOCAL_PRIVATE_PLATFORM_APIS:=true
 #LOCAL_SDK_VERSION := current
 LOCAL_RENDERSCRIPT_TARGET_API := 23
 
+#Do not override for targets using vanilla AOSP
+ifneq ($(TARGET_USES_AOSP),true)
 LOCAL_OVERRIDES_PACKAGES := Camera2
+endif
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-- 
GitLab