Commit 6719222f authored Jun 14, 2018 by Colin Cross

Fix ManifestMerger issues

Set LOCAL_MIN_SDK_VERSION in SettingsLib 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: Ie2c2458647cd6495418999b35894dc92343992cc

parent 1b9de57f

packages/SettingsLib/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ LOCAL_JAR_EXCLUDE_FILES := none

		LOCAL_SRC_FILES := $(call all-java-files-under, src)

		LOCAL_MIN_SDK_VERSION := 21

		include $(BUILD_STATIC_JAVA_LIBRARY)

		# For the test package.