From 9c5dd4e55e30173d03ae70f1c0e2216d7f2c9cd9 Mon Sep 17 00:00:00 2001
From: Pascal Muetschard <pmuetschard@google.com>
Date: Thu, 28 Feb 2019 16:39:10 -0800
Subject: [PATCH] Correctly set the target/min SDK API.

Sigh. For the NDK rule, the API level is really the minimum API level,
since that's what will be linked against, while for the SDK, it's the
target API. Our native code requires API level 21 (5.0 Lollipop), so
updated the manifests as well.

Fixes #2389
---
 gapidapk/android/apk/AndroidManifest.xml.in | 2 +-
 tools/build/rules/AndroidManifest.xml       | 2 +-
 tools/build/workspace.bzl                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gapidapk/android/apk/AndroidManifest.xml.in b/gapidapk/android/apk/AndroidManifest.xml.in
index aa892a922c..4ca2763b5e 100644
--- a/gapidapk/android/apk/AndroidManifest.xml.in
+++ b/gapidapk/android/apk/AndroidManifest.xml.in
@@ -21,7 +21,7 @@
     >
 
     <uses-sdk
-        android:minSdkVersion="16"
+        android:minSdkVersion="21"
         android:targetSdkVersion="26" />
 
     <application
diff --git a/tools/build/rules/AndroidManifest.xml b/tools/build/rules/AndroidManifest.xml
index c7a2b8b952..bb4b4ec082 100644
--- a/tools/build/rules/AndroidManifest.xml
+++ b/tools/build/rules/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="com.google.android.gapid.gapii">
 
     <uses-sdk
-        android:minSdkVersion="16"
+        android:minSdkVersion="21"
         android:targetSdkVersion="26" />
 
 </manifest>
diff --git a/tools/build/workspace.bzl b/tools/build/workspace.bzl
index 6acab708a7..3ebefe1164 100644
--- a/tools/build/workspace.bzl
+++ b/tools/build/workspace.bzl
@@ -199,14 +199,14 @@ def gapid_dependencies(android = True, mingw = True, locals = {}):
             native.android_sdk_repository,
             name = "androidsdk",
             locals = locals,
-            api_level = 26,
+            api_level = 26, # This is the target API
         )
 
         maybe_repository(
             native.android_ndk_repository,
             name = "androidndk",
             locals = locals,
-            api_level = 26,
+            api_level = 21, # This is the minimum API
         )
 
         maybe_repository(