summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert2016-10-05 15:47:31 -0500
committerMark Salyzyn2016-10-14 15:12:29 -0500
commitb7c3996f7c048eac6f113697a5734870f0b2cfdb (patch)
tree8a36cad36436ea67d759946cb951cf43ee94e559 /liblog/Android.bp
parent5171bebf41fa5f00d5d2bee071bcd15633172eb2 (diff)
downloadplatform-system-core-b7c3996f7c048eac6f113697a5734870f0b2cfdb.tar.gz
platform-system-core-b7c3996f7c048eac6f113697a5734870f0b2cfdb.tar.xz
platform-system-core-b7c3996f7c048eac6f113697a5734870f0b2cfdb.zip
Continue using the legacy NDK android/log.h.
system/core/android/log.h needs some work before it can be included in the NDK. It defines a *lot* of macros that previously were usable names in NDK sources that used android/log.h. As an example, the following file defines LOG_TAG as a variable, but the variable name gets macro replaced if we use the current android/log.h. https://android.googlesource.com/platform/external/deqp/+/4adc1515f867b26c19c2f7498e9de93a230a234d/framework/platform/android/tcuTestLogParserJNI.cpp#41 For now, we keep a copy of the old NDK android/log.h in legacy-ndk-includes. Test: make checkbuild Bug: http://b/30465923 Change-Id: I8ce942d1ee2f8f0d4c27130802c03992a1b85ec4
Diffstat (limited to 'liblog/Android.bp')
-rw-r--r--liblog/Android.bp15
1 files changed, 15 insertions, 0 deletions
diff --git a/liblog/Android.bp b/liblog/Android.bp
index c59dde921..bbaced537 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -91,6 +91,21 @@ cc_library {
91 compile_multilib: "both", 91 compile_multilib: "both",
92} 92}
93 93
94// system/core/android/log.h needs some work before it can be included in the
95// NDK. It defines a *lot* of macros that previously were usable names in NDK
96// sources that used android/log.h. As an example, the following file defines
97// LOG_TAG as a variable, but the variable name gets macro replaced if we use
98// the current android/log.h.
99// https://android.googlesource.com/platform/external/deqp/+/4adc1515f867b26c19c2f7498e9de93a230a234d/framework/platform/android/tcuTestLogParserJNI.cpp#41
100//
101// For now, we keep a copy of the old NDK android/log.h in legacy-ndk-includes.
102ndk_headers {
103 name: "liblog_headers",
104 from: "legacy-ndk-includes",
105 to: "android",
106 srcs: ["legacy-ndk-includes/log.h"],
107}
108
94ndk_library { 109ndk_library {
95 name: "liblog.ndk", 110 name: "liblog.ndk",
96 symbol_file: "liblog.map.txt", 111 symbol_file: "liblog.map.txt",