PeterCxy/SetupWizardLibrary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix ManifestMerger issues

Browse source 
Set LOCAL_MIN_SDK_VERSION in setup-wizard-lib 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: Ia72327d787c45f6e2f35df97094b92cf6e88e214
This commit is contained in:
Colin Cross 2018-06-15 11:51:23 -07:00
parent 4761101d3a
commit 4a5ff8044c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/Android.mk
View file

@ -15,6 +15,7 @@ LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/platform/res
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under, main/src platform/src)
LOCAL_MIN_SDK_VERSION := 23
include $(BUILD_STATIC_JAVA_LIBRARY)
@ -48,4 +49,6 @@ LOCAL_SHARED_ANDROID_LIBRARIES := \
android-support-v7-appcompat \
android-support-v7-recyclerview
LOCAL_MIN_SDK_VERSION := 14
include $(BUILD_STATIC_JAVA_LIBRARY)