summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-06-01 00:26:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-01 00:26:32 +0000
commit1163dbd0c8e2e9db1d0515206ef0b6ef1844776f (patch)
tree91d0a8eb662eb1ab1a89c88814d0d5d8b9cc4070
parent861a65d98b06b321938c649faef944d57d2894d6 (diff)
parent68197b23a4185a929fd5a6ff9a22b27998962274 (diff)
downloadbsdiff-1163dbd0c8e2e9db1d0515206ef0b6ef1844776f.tar.gz
Merge "Revert "Generate statically linked bsdiff."" am: 571c2861f9 am: 25e75349b5 am: 5dcee4ca87
am: 68197b23a4 * commit '68197b23a4185a929fd5a6ff9a22b27998962274': Revert "Generate statically linked bsdiff." Change-Id: I49d00baa1365dac5d9a01f7ffc18b2551c56386c
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index e74cc6d..8409d6b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -110,8 +110,6 @@ LOCAL_CFLAGS := $(bsdiff_common_cflags)
LOCAL_STATIC_LIBRARIES := \
libbsdiff \
$(bsdiff_static_libs)
-LOCAL_NO_FPIE := true
-LOCAL_LDFLAGS := -static
include $(BUILD_HOST_EXECUTABLE)
include $(CLEAR_VARS)