commit 53f6b2a80b3dfe66fa149e1f06bd07f12afa62d3
author Alan Viverette <alanv@google.com> Wed Feb 21 11:44:57 2018 -0500
committer Alan Viverette <alanv@google.com> Thu Mar 01 16:12:31 2018 +0000
tree 63387658eea38d69f31a4dfd3f16a64508075964
parent a5b2bad23254d4c93dd2de45d0b81842299a9ab9

Move Support Library dependencies to their own var with resolution

Bug: 73250914
Test: make checkbuild
Change-Id: Ibdbe2fd140133202b266ca4f233c4d42292fa3df

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 460a090..270a140 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -59,6 +59,7 @@
 LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING:=
 LOCAL_DEX_PREOPT:= # '',true,false,nostripping
 LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG:=
+LOCAL_DISABLE_RESOLVE_SUPPORT_LIBRARIES:=
 LOCAL_DONT_CHECK_MODULE:=
 # Don't delete the META_INF dir when merging static Java libraries.
 LOCAL_DONT_DELETE_JAR_META_INF:=