commit d5c632404eee37ea25a18d2e936a18ec678fce86
author android-build-team Robot <android-build-team-robot@google.com> Wed Feb 05 04:02:17 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Feb 05 04:02:17 2020 +0000
tree 1cda55a648b82ea750dc240d8a325b13164df806
parent 1974a6a92997523e1347f939a87ceb7c8339dd90
parent a534481a0cee14a9c4cd4bcb0a2aa7fff7a6c7a1

Snap for 6182732 from a534481a0cee14a9c4cd4bcb0a2aa7fff7a6c7a1 to rvc-release

Change-Id: I4d96097ef1945a6da91f6657fcf2b4c2380367ad

Android.bp

diff --git a/Android.bp b/Android.bp
index bc4c626..eb0ea10 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,6 +34,11 @@
     name: "libpcap",
     host_supported: true,
     vendor_available: true,
+    // Build against the NDK 29 because it's used by the network stack mainline module tests, which
+    // need to support Q.
+    // TODO(b/148792341): stop hardcoding sdk_version integers in libraries all over the tree and
+    // define a min_apex_sdk_version property that all module code can use.
+    sdk_version: "29",
     defaults: ["libpcap_defaults"],
 
     // (Matches order in libpcap's Makefile.)