commit 9deb331f20bf643ebcdffae00f9512c5696c2b50
author Colin Cross <ccross@android.com> Thu Sep 28 16:17:36 2017 -0700
committer Colin Cross <ccross@android.com> Thu Sep 28 21:40:35 2017 -0700
tree 25d3d60c314577639551f14e3e71ef9671c64aad
parent e984c78fafd37baec8cbd194626428bbecf081a5

Respect LOCAL_MIN_SDK_VERSION for dx

Follow Jack's behavior for now and pass LOCAL_MIN_SDK_VERSION to
dx.  Don't pass it to desugar for now, desugar with low
--min_sdk_version numbers enables features we haven't verified
yet, and existing apps won't be using the new language features
that require extra desugaring.

Test: examine classes.dex from an app with LOCAL_MIN_SDK_VERSION
Change-Id: Ic7d679b1b11fba98a33418a4f79d4762a91f1f9c

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 14e4509..ae62931 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2535,7 +2535,7 @@
 $(hide) rm -f $(dir $@)classes*.dex
 $(hide) $(DX_COMMAND) \
     --dex --output=$(dir $@) \
-    --min-sdk-version=$(call codename-or-sdk-to-sdk,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \
+    --min-sdk-version=$(PRIVATE_MIN_SDK_VERSION) \
     $(if $(NO_OPTIMIZE_DX), \
         --no-optimize) \
     $(if $(GENERATE_DEX_DEBUG), \