Fix ManifestMerger issues am: 4a5ff8044c

am: 0588a4e121

Change-Id: I191f10abea34d05b036f3a2a57572fc58fef4f26
This commit is contained in:
Colin Cross 2018-06-15 16:59:22 -07:00 committed by android-build-merger
commit 7c8910c4e4

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 := \
androidx.appcompat_appcompat \
androidx.recyclerview_recyclerview
LOCAL_MIN_SDK_VERSION := 14
include $(BUILD_STATIC_JAVA_LIBRARY)