Merge "Added static library target for pppd" am: 28eb3e4f83 am: dde1bdd633 am: 19d2f0440d am: 1a2e2349d9
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/1349164
Change-Id: I16b8f9b98317edab6060c9b7e9a765b3a2b1fe99
diff --git a/pppd/Android.bp b/pppd/Android.bp
index 4e01738..92b4cbd 100644
--- a/pppd/Android.bp
+++ b/pppd/Android.bp
@@ -27,10 +27,8 @@
local_include_dirs: ["include"],
}
-cc_binary {
- name: "pppd",
- defaults: ["ppp_defaults"],
-
+filegroup {
+ name: "pppd-sources",
srcs: [
"auth.c",
"ccp.c",
@@ -55,7 +53,17 @@
"tty.c",
"upap.c",
"utils.c",
+ ]
+}
+
+cc_library_static {
+ name: "libpppd",
+ defaults: ["ppp_defaults"],
+
+ srcs: [
+ ":pppd-sources"
],
+ export_include_dirs:[".", "include"],
// options.c:623:21: error: passing 'const char *' to parameter of
// type 'char *' discards qualifiers.
@@ -70,6 +78,7 @@
],
cflags: [
+ "-Dmain=main_loop",
"-Wno-empty-body",
"-Wno-attributes",
"-Wno-sign-compare",
@@ -83,6 +92,31 @@
],
}
+cc_binary {
+ name: "pppd",
+ defaults: ["ppp_defaults"],
+
+ srcs: [
+ ":pppd-sources"
+ ],
+
+ shared_libs: [
+ "libdl",
+ "liblog",
+ "libcutils",
+ "libcrypto",
+ ],
+
+ ldflags: ["-rdynamic"],
+
+ clang_cflags: ["-Wno-incompatible-pointer-types-discards-qualifiers"],
+
+ required: [
+ "pppol2tp-android",
+ "pppopptp-android",
+ ],
+}
+
cc_library_shared {
name: "pppol2tp-android",
defaults: ["ppp_defaults"],
