diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 19:28:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 19:28:06 +0000 |
| commit | b2966fd428cb06dd5aedba9a76a8b1eb54045e0b (patch) | |
| tree | e3c91cd249ec301599cfb651e542def91e410125 | |
| parent | 19f3aab438b0ede9adb9b1a382d44e143de5bd1e (diff) | |
| parent | 9b991a4f5aaaa52029a70a36cdb23e366c443136 (diff) | |
| download | chromium-trace-b2966fd428cb06dd5aedba9a76a8b1eb54045e0b.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: 9e8dcdbd01 am: 9b991a4f5a
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245
Change-Id: I6f0d46d0ae923a817865a724c250c9e3c84fea77
| -rw-r--r-- | catapult/systrace/atrace_helper/jni/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/catapult/systrace/atrace_helper/jni/Android.mk b/catapult/systrace/atrace_helper/jni/Android.mk index 9d5cc605..b8f6acbb 100644 --- a/catapult/systrace/atrace_helper/jni/Android.mk +++ b/catapult/systrace/atrace_helper/jni/Android.mk @@ -7,6 +7,9 @@ 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 |