summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2017-06-29 10:20:40 +0900
committerJiyong Park <jiyong@google.com>2017-06-29 10:25:25 +0900
commit9ffeab85bf76d4e9e028e461c9ac1341bc0ceaec (patch)
tree27203405534b2f34e0d3fceb9f94ce3220e1283e
parentc70bf5836c1d6b734af270ed7b3b8a9b425b83b9 (diff)
downloadsystem_core-9ffeab85bf76d4e9e028e461c9ac1341bc0ceaec.tar.gz
system_core-9ffeab85bf76d4e9e028e461c9ac1341bc0ceaec.tar.bz2
system_core-9ffeab85bf76d4e9e028e461c9ac1341bc0ceaec.zip
Allow SLOG* to vendors
Not only vendor libs, but also Android libs that are marked as vendor_available are using SLOG*. Since both pure vendor libs and Android libs available to vendors are using the same liblog headers for VNDK, SLOG* needs to be visible via the headers. Bug: 63088165 Test: BOARD_VNDK_VERSION=current m -j ATFWD-daemon (or any other vendor modules using SLOG*) Change-Id: Idfb74887a42d2418d3896bfdf5be3b4fc8e4c27f
-rw-r--r--libcutils/sched_policy.cpp7
-rw-r--r--liblog/include_vndk/log/log.h1
l---------liblog/include_vndk/log/log_system.h1
3 files changed, 2 insertions, 7 deletions
diff --git a/libcutils/sched_policy.cpp b/libcutils/sched_policy.cpp
index 4c303e6b1..e8537447d 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.
diff --git a/liblog/include_vndk/log/log.h b/liblog/include_vndk/log/log.h
index 01623df22..a79beecd4 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>
/*
diff --git a/liblog/include_vndk/log/log_system.h b/liblog/include_vndk/log/log_system.h
new file mode 120000
index 000000000..d0d390402
--- /dev/null
+++ b/liblog/include_vndk/log/log_system.h
@@ -0,0 +1 @@
+../../include/log/log_system.h \ No newline at end of file