Merge "Remove libandroid_trace" am: 242c212b80 am: 7d36816ecd am: 7e2c27581a

Change-Id: I6538c26435f38fef5185caaef30f5ae72469ba66

native/android/Android.bp

@@ -101,14 +101,6 @@ 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",

native/android/trace/android/trace.h

@@ -1,29 +0,0 @@
-/*
- * 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