From b276f63257d5f0c22b66bd51c6ceb223a9e89420 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Thu, 14 May 2020 13:55:09 -0700 Subject: Remove libandroid_trace We do not want platform code to be using TRACE_TAG_APP. This is being moved to system/tools/aidl and, with the new name libandroid_aidltrace, using TRACE_TAG_AIDL. Test: atest aidl_unittests aidl_integration_test && atest CtsNdkBinderTestCases Change-Id: I92ee2bf75fe82b0f212bb4a1908df482d6e81933 --- native/android/Android.bp | 8 -------- native/android/trace/android/trace.h | 29 ----------------------------- 2 files changed, 37 deletions(-) delete mode 100644 native/android/trace/android/trace.h (limited to 'native') diff --git a/native/android/Android.bp b/native/android/Android.bp index 9f52d856ea75..8f36decec400 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -93,14 +93,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", diff --git a/native/android/trace/android/trace.h b/native/android/trace/android/trace.h deleted file mode 100644 index 4e569e566bc2..000000000000 --- a/native/android/trace/android/trace.h +++ /dev/null @@ -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 - -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 -- cgit v1.2.3