commit 4f8246122f9324b1f19fad97a4b3e6362b8d6ee2
author Tom Cherry <tomcherry@google.com> Wed Jan 16 22:25:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 16 22:25:53 2019 +0000
tree f4c11c77b56b60129e33cd6932df9744b2c0c156
parent c8b83f3874cdef096b37e01ded8a15a47dbfa1c2
parent bab52203b7c0a2610c1f51428703388223cb634a

Merge "Use #pragma one for all liblog includes"

fs_mgr/libdm/Android.bp

diff --git a/fs_mgr/libdm/Android.bp b/fs_mgr/libdm/Android.bp
index fc1aafb..c8c2d83 100644
--- a/fs_mgr/libdm/Android.bp
+++ b/fs_mgr/libdm/Android.bp
@@ -33,6 +33,11 @@
         "libbase_headers",
         "liblog_headers",
     ],
+    target: {
+        darwin: {
+            enabled: false,
+        },
+    },
 }
 
 cc_test {

liblog/include/log/logd.h

diff --git a/liblog/include/log/logd.h b/liblog/include/log/logd.h
deleted file mode 100644
index 77400ca..0000000
--- a/liblog/include/log/logd.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _LIBS_LOG_LOGD_H
-#define _LIBS_LOG_LOGD_H
-#include <log/log.h>
-#warning "Deprecated: do not include log/logd.h, use log/log.h instead"
-#endif /*_LIBS_LOG_LOGD_H*/

liblog/include/log/logger.h

diff --git a/liblog/include/log/logger.h b/liblog/include/log/logger.h
deleted file mode 100644
index 1bf2d17..0000000
--- a/liblog/include/log/logger.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _LIBS_LOG_LOGGER_H
-#define _LIBS_LOG_LOGGER_H
-#include <log/log.h>
-#warning "Deprecated: do not include log/logger.h, use log/log.h instead"
-#endif /*_LIBS_LOG_LOGGER_H*/