commit 2df6545e56f11502128dec115e0e9848c34e138f
author Tao Bao <tbao@google.com> Wed Jun 01 00:26:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 00:26:22 2016 +0000
tree 44189764e8e135573649f89c935d796b58e3d4bd
parent 64a59cd7bf9fb3c95c1c2430088a4446fe257b31
parent 50b793e139cc2b1d479fd3d50ec86975d3b6b19b

Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf am: d8a518d711
am: 50b793e139

* commit '50b793e139cc2b1d479fd3d50ec86975d3b6b19b':
  Revert "imgdiff: Generate statically linked imgdiff."

Change-Id: I0043d779a4a035774a5ff4c6845c31d6c7b500a3

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)