aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYabin Cui <yabinc@google.com>2014-11-18 03:46:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-18 03:46:34 +0000
commit4ef951aa5e69116963f1836fe5ddcf6b87afbecd (patch)
tree0aa6b5fc7f9302e181f14395d98e58513271f8d9
parenta5f85097aed09890d03dba31f9d18db75ce50cd7 (diff)
parent2ca3c65991609bb5b48004ec3c7a66f6b417beed (diff)
downloadandroid_external_e2fsprogs-4ef951aa5e69116963f1836fe5ddcf6b87afbecd.tar.gz
android_external_e2fsprogs-4ef951aa5e69116963f1836fe5ddcf6b87afbecd.tar.bz2
android_external_e2fsprogs-4ef951aa5e69116963f1836fe5ddcf6b87afbecd.zip
am 2ca3c659: Merge "kill HAVE_TERMIO_H"
* commit '2ca3c65991609bb5b48004ec3c7a66f6b417beed': kill HAVE_TERMIO_H
-rw-r--r--misc/Android.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/misc/Android.mk b/misc/Android.mk
index 2a50e63a..63bf01b4 100644
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -377,7 +377,7 @@ blkid_src_files := \
blkid_c_includes := \
external/e2fsprogs/lib
-lsattr_cflags := -O2 -g -W -Wall \
+blkid_cflags := -O2 -g -W -Wall \
-DHAVE_UNISTD_H \
-DHAVE_ERRNO_H \
-DHAVE_NETINET_IN_H \
@@ -403,7 +403,8 @@ lsattr_cflags := -O2 -g -W -Wall \
-DHAVE_GETOPT_H \
-DHAVE_SYS_TIME_H \
-DHAVE_SYS_PARAM_H \
- -DHAVE_SYSCONF
+ -DHAVE_SYSCONF \
+ -DHAVE_TERMIO_H
blkid_shared_libraries := \
libext2fs \