commit 197e4afea4600599ee18c83428cc25d2ce5fc6ca
author Tao Bao <tbao@google.com> Tue May 31 22:57:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 31 22:57:04 2016 +0000
tree ef66bbdc3f30b4bfcf348c21541d9e35c8b4700a
parent 994bacf5496ba07240f70611b6c565f0dc24ca0c
parent f90090d4298e3a3a89f24a76199a93838b08db89

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

* commit 'f90090d4298e3a3a89f24a76199a93838b08db89':
  imgdiff: Generate statically linked imgdiff.

Change-Id: I38e6ba8e896d7bfe97351673a1f5e5da1ff4708f

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)