diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-16 17:26:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-16 17:26:08 +0000 |
| commit | 19f3aab438b0ede9adb9b1a382d44e143de5bd1e (patch) | |
| tree | b9a6b60023b853553ae095370bf251a2f1f7640e /catapult/systrace/atrace_helper/jni/Android.mk | |
| parent | f83016a5b126899df6781c1e754c7e9250830b5a (diff) | |
| parent | d5085cc096b959470581e35284bcc1d6d58e4cdd (diff) | |
| download | chromium-trace-19f3aab438b0ede9adb9b1a382d44e143de5bd1e.tar.gz | |
Merge changes I195c394b,Iff693cf6 am: b101eec5e1 am: d5085cc096
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1677030
Change-Id: Ic6e46abeb90a3aec17c6effae79f4f6cb6bd0086
Diffstat (limited to 'catapult/systrace/atrace_helper/jni/Android.mk')
| -rw-r--r-- | catapult/systrace/atrace_helper/jni/Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/catapult/systrace/atrace_helper/jni/Android.mk b/catapult/systrace/atrace_helper/jni/Android.mk index b8f6acbb..9d5cc605 100644 --- a/catapult/systrace/atrace_helper/jni/Android.mk +++ b/catapult/systrace/atrace_helper/jni/Android.mk @@ -7,9 +7,6 @@ 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 |