aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-04 01:22:30 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-04 01:22:30 +0000
commit65d69c9664925b85c1a02b2b16b5fe9f544f9fb9 (patch)
tree1cda55a648b82ea750dc240d8a325b13164df806
parent1974a6a92997523e1347f939a87ceb7c8339dd90 (diff)
parent83f31e5d5e7c2268becdf04f3f17a51956a2790c (diff)
downloadlibpcap-65d69c9664925b85c1a02b2b16b5fe9f544f9fb9.tar.gz
Merge "Set libpcap to compile against SDK 29." am: dcf5b2b6a1 am: 83f31e5d5e
Change-Id: Iafed3ffb185434e3885f6c388dc411975d359557
-rw-r--r--Android.bp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index bc4c6263..eb0ea103 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,6 +34,11 @@ cc_library {
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.)