commit a534481a0cee14a9c4cd4bcb0a2aa7fff7a6c7a1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 04 01:35:52 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 04 01:35:52 2020 +0000
tree 1cda55a648b82ea750dc240d8a325b13164df806
parent 1974a6a92997523e1347f939a87ceb7c8339dd90
parent 65d69c9664925b85c1a02b2b16b5fe9f544f9fb9

Merge "Set libpcap to compile against SDK 29." am: dcf5b2b6a1 am: 83f31e5d5e am: 65d69c9664

Change-Id: Iee287ba9ca309259c4965fab1736b88e3d2fd7d0

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.)