diff options
| author | Colin Cross <ccross@android.com> | 2018-06-14 15:59:32 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-06-15 15:25:17 -0700 |
| commit | f9abc344d6ef1dba89282da20562f33ffed74e47 (patch) | |
| tree | 31ff46012cbdf9e5b5d47a077c344aca14f9e4b7 | |
| parent | 3d7a02a34d2e0061d55d4a56721c261d94284eb6 (diff) | |
| download | TV-f9abc344d6ef1dba89282da20562f33ffed74e47.tar.gz | |
Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in tv libraries 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: I492916ffd17c3e454e4c8b19697153c7abb5763c
| -rw-r--r-- | partner_support/Android.mk | 1 | ||||
| -rw-r--r-- | tuner/Android.mk | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/partner_support/Android.mk b/partner_support/Android.mk index 9a45e705..8306921b 100644 --- a/partner_support/Android.mk +++ b/partner_support/Android.mk @@ -8,6 +8,7 @@ LOCAL_MODULE := live-channels-partner-support LOCAL_MODULE_CLASS := STATIC_JAVA_LIBRARIES LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := system_current +LOCAL_MIN_SDK_VERSION := 23 LOCAL_USE_AAPT2 := true diff --git a/tuner/Android.mk b/tuner/Android.mk index ce17a3ce..aedda3c1 100644 --- a/tuner/Android.mk +++ b/tuner/Android.mk @@ -36,6 +36,8 @@ LOCAL_SHARED_ANDROID_LIBRARIES := \ android-support-tv-provider \ tv-common \ +LOCAL_MIN_SDK_VERSION := 23 + include $(LOCAL_PATH)/buildconfig.mk include $(BUILD_STATIC_JAVA_LIBRARY) |