Merge "imgdiff: Generate statically linked imgdiff."
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)