commit fd49adbdaf3639b7e4565c6ef67bb060612e26c4
author Tao Bao <tbao@google.com> Wed Jun 01 00:16:24 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 00:16:24 2016 +0000
tree 86276f8fff255a0007334c11e044f59b44fbb899
parent a83b798c57e10301bca4486ca42e0cabaee5d188
parent 59203510eb5827ec36078e54076c809f82641821

Merge "Revert "imgdiff: Generate statically linked imgdiff.""
am: 59203510eb

* commit '59203510eb5827ec36078e54076c809f82641821':
  Revert "imgdiff: Generate statically linked imgdiff."

Change-Id: I5671a20ed1f01a61dfb36ecd0ad4db3002ca5045

applypatch/Android.mk

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