commit 536ef4e35a7355490670d285c1ab526d4da6f4e2
author Colin Cross <ccross@android.com> Tue Feb 21 16:14:55 2017 -0800
committer Colin Cross <ccross@android.com> Wed Feb 22 11:10:37 2017 -0800
tree f05116b51a47d9e85d9ee290477a40f30c9cfdb6
parent a7d4e0cd73e9eda41630baf69938bbddffbc530a

Pass min sdk version to dx and desugar

Test: make checkbuild
Change-Id: Idde9712508571ea623126c7d25d2fa67eccf4833

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index e9ec26a..0be983a 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2545,7 +2545,8 @@
 $(hide) java -jar $(DESUGAR) \
     $(addprefix --bootclasspath_entry ,$(call desugar-bootclasspath,$(PRIVATE_BOOTCLASSPATH))) \
     $(addprefix --classpath_entry ,$(PRIVATE_ALL_JAVA_LIBRARIES)) \
-    --min_sdk_version 24 --allow_empty_bootclasspath \
+    --min_sdk_version $(PRIVATE_SDK_VERSION) \
+    --allow_empty_bootclasspath \
     $(if $(filter --core-library,$(PRIVATE_DX_FLAGS)),--core_library) \
     -i $< -o $@.tmp
     mv $@.tmp $@
@@ -2561,6 +2562,7 @@
 $(hide) $(DX) \
     -JXms16M -JXmx2048M \
     --dex --output=$(dir $@) \
+    --min-sdk-version=$(PRIVATE_SDK_VERSION) \
     $(if $(NO_OPTIMIZE_DX), \
         --no-optimize) \
     $(if $(GENERATE_DEX_DEBUG), \