diff options
| author | Kenny Root <kroot@google.com> | 2012-10-16 18:00:29 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-10-16 18:00:29 -0700 |
| commit | efb5e3c709214cfc45beec5fcc66c93223ffc744 (patch) | |
| tree | b237c6f2209f0cc61a333c3fc2b853ef78bbd200 /fastboot | |
| parent | 55d039efb5d30377e2a66d931a7408b13ac24650 (diff) | |
| parent | 20f5daa8653eb2d81af8c161a2084e3b53ec3914 (diff) | |
| download | system_core-efb5e3c709214cfc45beec5fcc66c93223ffc744.zip system_core-efb5e3c709214cfc45beec5fcc66c93223ffc744.tar.gz system_core-efb5e3c709214cfc45beec5fcc66c93223ffc744.tar.bz2 | |
resolved conflicts for merge of 20f5daa8 to master
Change-Id: Ie3e67696d265a56dfa4d089c777506f27783a9a6
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 5e0e172..1189e1f 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -58,9 +58,7 @@ LOCAL_STATIC_LIBRARIES := \ libz ifneq ($(HOST_OS),windows) -ifeq ($(HAVE_SELINUX), true) LOCAL_STATIC_LIBRARIES += libselinux -endif # HAVE_SELINUX endif # HOST_OS != windows include $(BUILD_HOST_EXECUTABLE) |