diff options
| author | Kenny Root <kroot@google.com> | 2012-10-16 17:51:14 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-10-16 17:51:14 -0700 |
| commit | 20f5daa8653eb2d81af8c161a2084e3b53ec3914 (patch) | |
| tree | 716474f1851ccb7de43bc9806bc1bcae2e264476 /fastboot/Android.mk | |
| parent | d94301799518a69f2b2b5a2b20bf9d4403658d7e (diff) | |
| parent | 44f4f8a4d2bef6e9fc37cd50076295102b38828a (diff) | |
| download | system_core-20f5daa8653eb2d81af8c161a2084e3b53ec3914.zip system_core-20f5daa8653eb2d81af8c161a2084e3b53ec3914.tar.gz system_core-20f5daa8653eb2d81af8c161a2084e3b53ec3914.tar.bz2 | |
resolved conflicts for merge of 44f4f8a4 to jb-mr1-dev-plus-aosp
Change-Id: I66988d8e87a8110ca9ab3da19870b80bbaf06eba
Diffstat (limited to 'fastboot/Android.mk')
| -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 92e9219..5025dae 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -57,9 +57,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) |