commit 50b793e139cc2b1d479fd3d50ec86975d3b6b19b
author Tao Bao <tbao@google.com> Wed Jun 01 00:23:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 00:23:16 2016 +0000
tree 75677053eaf8b9528b8edaf3cae9dc1b70a0b0de
parent 197e4afea4600599ee18c83428cc25d2ce5fc6ca
parent d8a518d711f6958c04c28e4ee767121c201f2d9a

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

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

Change-Id: I47db6e16750e4f4c0cfa56b076871fd6729bce48

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)