diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index d6c83367f..8bf74c7a5 100644 --- a/Android.mk +++ b/Android.mk @@ -53,7 +53,11 @@ strongswan_CFLAGS := \ -DUSE_VSTR \ -DROUTING_TABLE=0 \ -DROUTING_TABLE_PRIO=220 \ +<<<<<<< HEAD -DVERSION=\"4.5.0\" \ +======= + -DVERSION=\"4.5.1\" \ +>>>>>>> upstream/4.5.1 -DPLUGINS='"$(strongswan_PLUGINS)"' \ -DIPSEC_DIR=\"/system/bin\" \ -DIPSEC_PIDDIR=\"/data/misc/vpn\" \ |