summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2016-12-21 17:15:24 -0600
committerMark Salyzyn2017-01-30 16:14:59 -0600
commitbdac221cc3e87f0c1779f22df45f8efb3c610ffc (patch)
tree4a8333e79d534fc38116cf1cb475a74016e9d0d9 /liblog/Android.bp
parenta5cfc8b1e6140ac7a7bfc7bffa36de3d6543b59a (diff)
downloadplatform-system-core-bdac221cc3e87f0c1779f22df45f8efb3c610ffc.tar.gz
platform-system-core-bdac221cc3e87f0c1779f22df45f8efb3c610ffc.tar.xz
platform-system-core-bdac221cc3e87f0c1779f22df45f8efb3c610ffc.zip
Revert "Continue using the legacy NDK android/log.h."
Use refreshed android/log.h for NDK This effectively a modern revert of the commit b7c3996f7c048eac6f113697a5734870f0b2cfdb Test: build Bug: 30465923 Bug: 34250038 Change-Id: I7d4a5134bb711051283c36a2d5bc803436dca12e
Diffstat (limited to 'liblog/Android.bp')
-rw-r--r--liblog/Android.bp12
1 files changed, 2 insertions, 10 deletions
diff --git a/liblog/Android.bp b/liblog/Android.bp
index dce316d6d..747fcc8dc 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -97,19 +97,11 @@ cc_library {
97 compile_multilib: "both", 97 compile_multilib: "both",
98} 98}
99 99
100// system/core/android/log.h needs some work before it can be included in the
101// NDK. It defines a *lot* of macros that previously were usable names in NDK
102// sources that used android/log.h. As an example, the following file defines
103// LOG_TAG as a variable, but the variable name gets macro replaced if we use
104// the current android/log.h.
105// https://android.googlesource.com/platform/external/deqp/+/4adc1515f867b26c19c2f7498e9de93a230a234d/framework/platform/android/tcuTestLogParserJNI.cpp#41
106//
107// For now, we keep a copy of the old NDK android/log.h in legacy-ndk-includes.
108ndk_headers { 100ndk_headers {
109 name: "liblog_headers", 101 name: "liblog_headers",
110 from: "legacy-ndk-includes", 102 from: "include/android",
111 to: "android", 103 to: "android",
112 srcs: ["legacy-ndk-includes/log.h"], 104 srcs: ["include/android/log.h"],
113 license: "NOTICE", 105 license: "NOTICE",
114} 106}
115 107