commit f90090d4298e3a3a89f24a76199a93838b08db89
author Tao Bao <tbao@google.com> Tue May 31 22:54:09 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 31 22:54:09 2016 +0000
tree 95b4e7e0a80d7b6a25432216f6ead4ee9b01dab2
parent 3f6eb86390e27707d1204e60e33b6a41e88f0dc8
parent a83b798c57e10301bca4486ca42e0cabaee5d188

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

* commit 'a83b798c57e10301bca4486ca42e0cabaee5d188':
  imgdiff: Generate statically linked imgdiff.

Change-Id: Ib51333ea8a0d3d533777198a58ea987af31ebed4

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)