commit 7b7cdb777728605a986b35b356a874bf066712de
author Alan Viverette <alanv@google.com> Thu Mar 22 14:07:58 2018 -0400
committer Colin Cross <ccross@android.com> Thu May 03 16:47:11 2018 -0700
tree 150935c193a060feaa7f14c0890a0ae496841601
parent fb8f5baae423a5ca952d4a47c788e1280bb118af

Always statically include Support Libraries, move SDK definitions up a dir

Bug: 73250914
Bug: 74248169
Test: make && make cts
Change-Id: Id7198997ac5cacf76fd8ab155a60026d65e420ec
Merged-In: Id7198997ac5cacf76fd8ab155a60026d65e420ec
(cherry picked from commit 1efaf37cb7dda6807f66062ca6bf001f5066e4b4)

core/project_definitions.mk

diff --git a/core/project_definitions.mk b/core/project_definitions.mk
index 68572eb..5728b67 100644
--- a/core/project_definitions.mk
+++ b/core/project_definitions.mk
@@ -19,6 +19,6 @@
 #
 
 #
-# Include definitions for Support Library modules, if present.
+# Include definitions for prebuilt SDK, if present.
 #
--include prebuilts/sdk/current/support/definitions.mk
+-include prebuilts/sdk/current/definitions.mk