From 9ca6942956fddc395d68484993ce54275c234b4f Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 20 Feb 2018 15:30:31 -0800
Subject: [PATCH] Add aapt includes for prebuilt SDK jars

Add -I arguments to the aapt link command line if sdk_version is
set to a numbered SDK prebuilt jar.

Test: m checkbuild
Change-Id: Ieeadf84bc131ba94e0e4ee1b9eec7d1e80b31b19
---
 java/app.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/app.go b/java/app.go
index 05cd8b31d..dc7f84876 100644
--- a/java/app.go
+++ b/java/app.go
@@ -273,6 +273,12 @@ func (a *AndroidApp) aapt2Flags(ctx android.ModuleContext) (flags []string, deps
 		linkDeps = append(linkDeps, depFiles...)
 	})
 
+	sdkDep := decodeSdkDep(ctx, String(a.deviceProperties.Sdk_version))
+	if sdkDep.useFiles {
+		linkFlags = append(linkFlags, "-I "+sdkDep.jar.String())
+		linkDeps = append(linkDeps, sdkDep.jar)
+	}
+
 	// SDK version flags
 	sdkVersion := String(a.deviceProperties.Sdk_version)
 	switch sdkVersion {