From 5fdc24aa6cc0acfd6a2d5939862e6edbe14f1ef6 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 14 Jun 2018 15:59:32 -0700
Subject: Fix ManifestMerger issues

Set LOCAL_MIN_SDK_VERSION in tv-common so that the build system
doesn't raise the minSdkVersion value specified in the manifest, which
causes ManifestMerger to error when trying to merge it into a package
that specifies a lower minSdkVersion.

Bug: 78447299
Test: m java
Change-Id: Id49101542185ee5e0dc8c06928126e2f36c26f5c
---
 common/Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/Android.mk b/common/Android.mk
index ff19392e..e1d10c7b 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -20,6 +20,8 @@ LOCAL_SHARED_ANDROID_LIBRARIES := \
     android-support-v7-recyclerview \
     android-support-v17-leanback \
 
+LOCAL_MIN_SDK_VERSION := 23
+
 include $(LOCAL_PATH)/buildconfig.mk
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
-- 
cgit v1.2.3