diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 19:01:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 19:01:40 +0000 |
| commit | 9b991a4f5aaaa52029a70a36cdb23e366c443136 (patch) | |
| tree | e3c91cd249ec301599cfb651e542def91e410125 | |
| parent | d5085cc096b959470581e35284bcc1d6d58e4cdd (diff) | |
| parent | 9e8dcdbd01c95009493e3303f85679d95974b95c (diff) | |
| download | chromium-trace-9b991a4f5aaaa52029a70a36cdb23e366c443136.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: 9e8dcdbd01android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245
Change-Id: I28dcc74aced2954e05450ce10bd16287e369bf19
| -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 |