diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-16 03:07:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-16 03:07:42 +0000 |
| commit | 2f07721b3d0cba2112a375eeed3a231273b4d053 (patch) | |
| tree | 5b857522896841bda6b11a450011904912f76e79 | |
| parent | 3938c2943e581e786a76c86231aae48d1e7cbd64 (diff) | |
| parent | 0db17ff248830fee312ebae545e3270be80fc128 (diff) | |
| download | chromium-trace-2f07721b3d0cba2112a375eeed3a231273b4d053.tar.gz | |
Merge "Remove unused Android.mk files in chromium-trace" into main am: 0db17ff248
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/2825993
Change-Id: I7218cfb302f14797ca9c17c421aeb4f073ef24de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | catapult/systrace/atrace_helper/jni/Android.mk | 27 |
2 files changed, 0 insertions, 29 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index d318e533..00000000 --- a/Android.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This empty Android.mk prevents ./catapult/systrace/atrace_helper -# from being built by default diff --git a/catapult/systrace/atrace_helper/jni/Android.mk b/catapult/systrace/atrace_helper/jni/Android.mk deleted file mode 100644 index b8f6acbb..00000000 --- a/catapult/systrace/atrace_helper/jni/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := atrace_helper -LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../NOTICE -LOCAL_CPPFLAGS := -std=c++11 -Wall -Wextra -Werror -O2 -LOCAL_CPPFLAGS += -fPIE -fno-rtti -fno-exceptions -fstack-protector -LOCAL_CPP_EXTENSION := .cc -LOCAL_LDLIBS := -fPIE -pie -llog - -LOCAL_SRC_FILES := \ - main.cc \ - atrace_process_dump.cc \ - file_utils.cc \ - libmemtrack_wrapper.cc \ - process_memory_stats.cc \ - procfs_utils.cc \ - time_utils.cc - -include $(BUILD_EXECUTABLE) |