summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-01-09 14:44:13 -0600
committerMark Salyzyn2017-01-25 17:41:43 -0600
commit5c967da341c9395a4c378c149f326505224ec66e (patch)
tree0e1de2d192d55de6300d99269441882ccbb0b2bd /liblog/include_vndk
parent01678a0c84e1f94420630709fe7aea7b4357f019 (diff)
downloadplatform-system-core-5c967da341c9395a4c378c149f326505224ec66e.tar.gz
platform-system-core-5c967da341c9395a4c378c149f326505224ec66e.tar.xz
platform-system-core-5c967da341c9395a4c378c149f326505224ec66e.zip
ndk: reverse course on android/log.h
move LOG macros to log/log_main.h move include/android/log.h to liblog/include/android/log.h Test: compile of all components and gTest liblog-unit-tests Bug: 34250038 Bug: 30465923 Change-Id: If182dd9b83689e8b7bc1a44b2f5d913c7ee5eeee
Diffstat (limited to 'liblog/include_vndk')
l---------liblog/include_vndk/android2
-rw-r--r--liblog/include_vndk/log/log.h1
l---------liblog/include_vndk/log/log_main.h1
3 files changed, 3 insertions, 1 deletions
diff --git a/liblog/include_vndk/android b/liblog/include_vndk/android
index 69fbc0947..a3c0320f9 120000
--- a/liblog/include_vndk/android
+++ b/liblog/include_vndk/android
@@ -1 +1 @@
../../include/android/ \ No newline at end of file ../include/android \ No newline at end of file
diff --git a/liblog/include_vndk/log/log.h b/liblog/include_vndk/log/log.h
index f3eb3fe14..5d720f6d1 100644
--- a/liblog/include_vndk/log/log.h
+++ b/liblog/include_vndk/log/log.h
@@ -4,6 +4,7 @@
4#define _LIBS_LOG_LOG_H 4#define _LIBS_LOG_LOG_H
5 5
6#include <android/log.h> 6#include <android/log.h>
7#include <log/log_main.h>
7 8
8/*The following files will be included once they are available*/ 9/*The following files will be included once they are available*/
9/*#include <log/log_id.h>*/ 10/*#include <log/log_id.h>*/
diff --git a/liblog/include_vndk/log/log_main.h b/liblog/include_vndk/log/log_main.h
new file mode 120000
index 000000000..f2ec01835
--- /dev/null
+++ b/liblog/include_vndk/log/log_main.h
@@ -0,0 +1 @@
../../include/log/log_main.h \ No newline at end of file