commit a83b798c57e10301bca4486ca42e0cabaee5d188
author Tao Bao <tbao@google.com> Tue May 31 22:51:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 31 22:51:16 2016 +0000
tree 1c2e4c7ecdc0676c558efcb3a1f0ca92ce2808c2
parent 1ae2434c117a3cd0b504e3f3ad24730577836a69
parent 680d783eccbc6b1154495a5040e6483f1f42bb89

Merge "imgdiff: Generate statically linked imgdiff."
am: 680d783ecc

* commit '680d783eccbc6b1154495a5040e6483f1f42bb89':
  imgdiff: Generate statically linked imgdiff.

Change-Id: Icdf693eacf655d38e1dcceb76ea9e2742e965b2f

applypatch/Android.mk

diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index a15ac02..7b46c59 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -97,5 +97,6 @@
     libdivsufsort64 \
     libdivsufsort \
     libz
-LOCAL_FORCE_STATIC_EXECUTABLE := true
+LOCAL_NO_FPIE := true
+LOCAL_LDFLAGS := -static
 include $(BUILD_HOST_EXECUTABLE)