Update for new version of libnl.
Add a new local include in the blueprint file.
Move the defs.h file to config.h and update it with all of the new
values.
Test: Builds, treehugger.
Change-Id: I19c7bdfacad6d6af4c3b0f77675d046586ae7951
diff --git a/Android.bp b/Android.bp
index 841ecc8..fc6a4a8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,6 +83,7 @@
local_include_dirs: [
"include",
+ "lib/route",
],
export_include_dirs: ["include"],
cflags: [
diff --git a/include/defs.h b/include/config.h
similarity index 66%
rename from include/defs.h
rename to include/config.h
index 62785cb..a64cb61 100644
--- a/include/defs.h
+++ b/include/config.h
@@ -1,17 +1,23 @@
-/* lib/defs.h.in. Generated from configure.ac by autoheader. */
+/* include/config.h. Generated from config.h.in by configure. */
+/* include/config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 to disable pthreads */
#undef DISABLE_PTHREADS
+/* Define to 1 if you have the declaration of `getprotobyname_r', and to 0 if
+ you don't. */
+#undef HAVE_DECL_GETPROTOBYNAME_R
+
+/* Define to 1 if you have the declaration of `getprotobynumber_r', and to 0
+ if you don't. */
+#undef HAVE_DECL_GETPROTOBYNUMBER_R
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
/* Define to 1 if you have the `pthread' library (-lpthread). */
#undef HAVE_LIBPTHREAD
@@ -19,25 +25,31 @@
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strerror_l' function. */
+#undef HAVE_STRERROR_L
/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
+#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
+#define HAVE_STRING_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
+#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
+#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
@@ -70,8 +82,10 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+ required in a freestanding environment). This macro is provided for
+ backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
/* Version number of package */
#undef VERSION
