commit d8a518d711f6958c04c28e4ee767121c201f2d9a
author Tao Bao <tbao@google.com> Wed Jun 01 00:19:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 00:19:34 2016 +0000
tree 5a72c44e196d110faa67a127da1364f89a43b612
parent f90090d4298e3a3a89f24a76199a93838b08db89
parent fd49adbdaf3639b7e4565c6ef67bb060612e26c4

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

* commit 'fd49adbdaf3639b7e4565c6ef67bb060612e26c4':
  Revert "imgdiff: Generate statically linked imgdiff."

Change-Id: Id391b970b3f7cda5ead0cb469b2d09379059e89d

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)