commit 64a59cd7bf9fb3c95c1c2430088a4446fe257b31
author Tao Bao <tbao@google.com> Tue May 31 23:00:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 31 23:00:28 2016 +0000
tree 0066a7b6413dc91c793ccc57f6efb1b998b7b79e
parent 51dc9444bcf8d8900a521795e873d07f6cd445ef
parent 197e4afea4600599ee18c83428cc25d2ce5fc6ca

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

* commit '197e4afea4600599ee18c83428cc25d2ce5fc6ca':
  imgdiff: Generate statically linked imgdiff.

Change-Id: I7ac7ab9d25cb95ced69d98d4c33349a2590a446a

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)