commit c9aaef3683077c2029d3612c55adaad8e33aa0aa
author Christopher Ferris <cferris@google.com> Thu Jun 29 07:02:08 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 29 07:02:08 2017 +0000
tree 84d7d75c7b59b3c1ae9573745556c92dc2da1075
parent 898b791564f3715ac5ac0c075f821c5789c47868
parent f04c838998513effefefd6970e710ddc5e62f285

Merge "Fix mac build."

libcutils/sched_policy.cpp

diff --git a/libcutils/sched_policy.cpp b/libcutils/sched_policy.cpp
index aeb881a..bc40ba9 100644
--- a/libcutils/sched_policy.cpp
+++ b/libcutils/sched_policy.cpp
@@ -28,13 +28,6 @@
 
 #define UNUSED __attribute__((__unused__))
 
-#ifndef SLOGE
-#define SLOGE ALOGE
-#endif
-#ifndef SLOGW
-#define SLOGW ALOGW
-#endif
-
 /* Re-map SP_DEFAULT to the system default policy, and leave other values unchanged.
  * Call this any place a SchedPolicy is used as an input parameter.
  * Returns the possibly re-mapped policy.

liblog/include_vndk/log/log.h

diff --git a/liblog/include_vndk/log/log.h b/liblog/include_vndk/log/log.h
index 01623df..a79beec 100644
--- a/liblog/include_vndk/log/log.h
+++ b/liblog/include_vndk/log/log.h
@@ -9,6 +9,7 @@
 #include <log/log_radio.h>
 #include <log/log_read.h>
 #include <log/log_safetynet.h>
+#include <log/log_system.h>
 #include <log/log_time.h>
 
 /*

liblog/include_vndk/log/log_system.h

diff --git a/liblog/include_vndk/log/log_system.h b/liblog/include_vndk/log/log_system.h
new file mode 120000
index 0000000..d0d3904
--- /dev/null
+++ b/liblog/include_vndk/log/log_system.h
@@ -0,0 +1 @@
+../../include/log/log_system.h
\ No newline at end of file