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
diff --git a/liblog/Android.bp b/liblog/Android.bp
index dce316d..747fcc8 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -97,19 +97,11 @@
compile_multilib: "both",
}
-// 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.
ndk_headers {
name: "liblog_headers",
- from: "legacy-ndk-includes",
+ from: "include/android",
to: "android",
- srcs: ["legacy-ndk-includes/log.h"],
+ srcs: ["include/android/log.h"],
license: "NOTICE",
}