| commit | 0cdccd707fab25c6f63bd72f87260b71ecaf3f1b | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Thu Jun 11 16:37:31 2020 +0100 |
| committer | Orion Hodson <oth@google.com> | Wed Jun 24 14:13:13 2020 +0100 |
| tree | 631fb2ad4f318c51980d86a93d99ee35968a32d3 | |
| parent | b90c974174a3420fe75e778160dad6a89cf337e8 [diff] |
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)
diff --git a/Tethering/jni/android_net_util_TetheringUtils.cpp b/Tethering/jni/android_net_util_TetheringUtils.cpp index 5493440..f6eb40a 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>