Merge "Create a header-only library for atrace in platform NDK builds" am: f1e3232bd2

Change-Id: I01b376e95bb61c7612b18c1d5d77393f073da1cd

2 files changed, 38 insertions, 1 deletions

diff --git a/native/android/Android.bp b/native/android/Android.bp
index ae8cb3a47a05..9f52d856ea75 100644
--- a/native/android/Android.bp
+++ b/native/android/Android.bp
@@ -93,6 +93,14 @@ cc_library_shared {
     },
 }
 
+// Header-only library used for atrace in platform NDK builds
+cc_library_headers {
+    name: "libandroid_trace",
+    host_supported: true,
+    vendor_available: true,
+    export_include_dirs: ["trace"],
+}
+
 // Network library.
 cc_library_shared {
     name: "libandroid_net",
@@ -137,4 +145,4 @@ filegroup {
         "aidl/com/android/internal/compat/IPlatformCompatNative.aidl",
     ],
     path: "aidl",
-}
\ No newline at end of file
+}
diff --git a/native/android/trace/android/trace.h b/native/android/trace/android/trace.h
new file mode 100644
index 000000000000..4e569e566bc2
--- /dev/null
+++ b/native/android/trace/android/trace.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef ANDROID_ATRACE_HEADERS_H
+#define ANDROID_ATRACE_HEADERS_H
+
+#include <cutils/trace.h>
+
+inline void ATrace_beginSection(const char* sectionName) {
+    atrace_begin(ATRACE_TAG_APP, sectionName);
+}
+
+inline void ATrace_endSection() {
+    atrace_end(ATRACE_TAG_APP);
+}
+
+#endif // ANDROID_ATRACE_HEADERS_H