diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-16 21:13:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-16 21:13:06 +0000 |
| commit | 5ec6622f80cf138491d62c3e5264d3435a199d5f (patch) | |
| tree | 4f756f2cdefece987680e3c1aaf1c770b2e3ac98 | |
| parent | 481ecea8372fdb116dc5eec3f4a76f3d8cb88fe9 (diff) | |
| parent | caa62ba8639ce38f09caebfda172d78274a97461 (diff) | |
| download | chromium-trace-5ec6622f80cf138491d62c3e5264d3435a199d5f.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace"android-s-preview-1
| -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 |