diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 20:19:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 20:19:43 +0000 |
| commit | f15fa28ad3028a95fc6bd7d59f1df0b12e5261c6 (patch) | |
| tree | e3c91cd249ec301599cfb651e542def91e410125 | |
| parent | b605b0629a92b7d548b561f2b87d9fa1c89f727f (diff) | |
| parent | 138ade68f9d3388a1b0a6d9ce5e091ff6f7e7448 (diff) | |
| download | chromium-trace-f15fa28ad3028a95fc6bd7d59f1df0b12e5261c6.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: 9e8dcdbd01 am: 9b991a4f5a am: b2966fd428 am: 138ade68f9
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245
Change-Id: Ie9caf5a4e5c3a3064116970d679cc7c8605fe1ab
| -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 |