| commit | 138ade68f9d3388a1b0a6d9ce5e091ff6f7e7448 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 21 20:01:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 20:01:06 2021 +0000 |
| tree | e3c91cd249ec301599cfb651e542def91e410125 | |
| parent | ef2f29d2b3cf25a46be203d6b12ad0eceaf270b2 [diff] | |
| parent | b2966fd428cb06dd5aedba9a76a8b1eb54045e0b [diff] |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: 9e8dcdbd01 am: 9b991a4f5a am: b2966fd428 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245 Change-Id: Iafc1c71000b1ac6f0f85560d10c63a3a14046be2
diff --git a/catapult/systrace/atrace_helper/jni/Android.mk b/catapult/systrace/atrace_helper/jni/Android.mk index 9d5cc60..b8f6acb 100644 --- a/catapult/systrace/atrace_helper/jni/Android.mk +++ b/catapult/systrace/atrace_helper/jni/Android.mk
@@ -7,6 +7,9 @@ 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