commit 1514d689d33ffdff88db6f57436d57e737d548cf
author Sen Jiang <senj@google.com> Fri Apr 08 14:20:31 2016 -0700
committer Sen Jiang <senj@google.com> Mon Apr 11 20:47:07 2016 +0000
tree 36028c1594ef7765fb986c483914132fde9eb918
parent 297e583af1cec04f5f332b57b91f846921744c91

Don't reference variables from bsdiff Android.mk.

Change-Id: If4e10039a22f7c1c041072ce0249dca9b243aa16
Test: mma
Bug: 26955860

Android.mk

diff --git a/Android.mk b/Android.mk
index 26ed6e6..107a844 100644
--- a/Android.mk
+++ b/Android.mk
@@ -802,10 +802,17 @@
 LOCAL_MODULE_STEM := bsdiff
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := ../../external/bsdiff/bsdiff_main.cc
-LOCAL_CFLAGS := $(bsdiff_common_cflags)
+LOCAL_CFLAGS := \
+    -D_FILE_OFFSET_BITS=64 \
+    -Wall \
+    -Werror \
+    -Wextra \
+    -Wno-unused-parameter
 LOCAL_STATIC_LIBRARIES := \
     libbsdiff \
-    $(bsdiff_static_libs)
+    libbz \
+    libdivsufsort64 \
+    libdivsufsort
 include $(BUILD_EXECUTABLE)
 
 # test_subprocess (type: executable)