Restore __ANDROID_API__ guards for core <android/*> APIs
This commit restores the __ANDROID_API__ guards removed in
"Add __INTRODUCED_IN to core <android/*.h> APIs.",
commit 9db409b053460e065cefb1d1caefe048f90cfff0.
Add a guard to surface_texture.h.
In choreographer.h, declare the types even for older APIs.
Bug: http://b/111668906
Bug: http://b/113052379
Test: builds
Change-Id: Ia013f48a109310f9f8ca6a3211f28fcb69dd602d
(cherry picked from commit 92b1ebea095f9cac70b81ae7382ae69583c9914d)
diff --git a/include/android/trace.h b/include/android/trace.h
index 0c44732..aa24995 100644
--- a/include/android/trace.h
+++ b/include/android/trace.h
@@ -39,6 +39,8 @@
extern "C" {
#endif
+#if __ANDROID_API__ >= 23
+
/**
* Returns true if tracing is enabled. Use this to avoid expensive computation only necessary
* when tracing is enabled.
@@ -69,6 +71,8 @@
*/
void ATrace_endSection() __INTRODUCED_IN(23);
+#endif /* __ANDROID_API__ >= 23 */
+
#ifdef __cplusplus
};
#endif