diff options
| author | Devin Moore <devinmoore@google.com> | 2020-05-15 16:08:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-15 16:08:41 +0000 |
| commit | 7d36816ecd47008e322e96b654d2ab4fba339d17 (patch) | |
| tree | 5b96cf8344e94910c05fd30fe19c604716dbd25a /native | |
| parent | b1f5f8d5fe89e46508df8042769ce5ceb7966e3d (diff) | |
| parent | 242c212b8075cd259ff5e39b949e9f384dca1b18 (diff) | |
Merge "Remove libandroid_trace" am: 242c212b80
Change-Id: I861fa8ecf6ac2582878ba0d20a5131f1861cc586
Diffstat (limited to 'native')
| -rw-r--r-- | native/android/Android.bp | 8 | ||||
| -rw-r--r-- | native/android/trace/android/trace.h | 29 |
2 files changed, 0 insertions, 37 deletions
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 <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 |