| commit | 697ec868d2478aa6ea7249f756ad4f7f6fe75d64 | [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 12:47:10 2020 +0000 |
| tree | 41e2da029ca5fdd40af7be2cbd77948cc56751c8 | |
| parent | 5c5ee11ba0b5f0ab9fa9fa5fddd5fe44a4fcf2c4 [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>