From 0cdccd707fab25c6f63bd72f87260b71ecaf3f1b Mon Sep 17 00:00:00 2001
From: Orion Hodson <oth@google.com>
Date: Thu, 11 Jun 2020 16:37:31 +0100
Subject: [PATCH] Sync with libnativehelper refactoring

jniGetFDFromFileDescriptor() is now a legacy method and moved to a
separate header.

Bug: 151443957
Bug: 158749603
Test: m
Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c4682505d0336113654bb7f5ea77b9d8dad626)
---
 Tethering/jni/android_net_util_TetheringUtils.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Tethering/jni/android_net_util_TetheringUtils.cpp b/Tethering/jni/android_net_util_TetheringUtils.cpp
index 5493440644..f6eb40a842 100644
--- a/Tethering/jni/android_net_util_TetheringUtils.cpp
+++ b/Tethering/jni/android_net_util_TetheringUtils.cpp
@@ -18,6 +18,7 @@
 #include <error.h>
 #include <jni.h>
 #include <nativehelper/JNIHelp.h>
+#include <nativehelper/JNIHelpCompat.h>
 #include <nativehelper/ScopedUtfChars.h>
 #include <net/if.h>
 #include <netinet/icmp6.h>