diff options
| author | Colin Cross <ccross@android.com> | 2018-06-15 16:51:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-15 16:51:20 -0700 |
| commit | 0588a4e12126740370507d068e3cef6f912239a9 (patch) | |
| tree | f9f79314b4da21860e149362330cbfd9d46670eb /library | |
| parent | c763434b463dba4d4d17212e0aaf762d0892ef00 (diff) | |
| parent | 4a5ff8044c5069aa7e6cd1774cee8d7f5f9595da (diff) | |
| download | setupwizard-0588a4e12126740370507d068e3cef6f912239a9.tar.gz | |
Fix ManifestMerger issues
am: 4a5ff8044c
Change-Id: I3a250a330cf193fd73a699e5d84d7d3455cccb44
Diffstat (limited to 'library')
| -rw-r--r-- | library/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/library/Android.mk b/library/Android.mk index ff92194..6cbfae8 100644 --- a/library/Android.mk +++ b/library/Android.mk @@ -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) |