| commit | 43f424832931f2a8e523ec067f41b8281356b3a6 | [log] [tgz] |
|---|---|---|
| author | Bob Badour <bbadour@google.com> | Tue Feb 16 23:17:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 16 23:17:58 2021 +0000 |
| tree | 4f756f2cdefece987680e3c1aaf1c770b2e3ac98 | |
| parent | ee8abd6f6e44fcaf4edbbadf5d50234a04398bd5 [diff] | |
| parent | ba4ce1eca931c7304734497d7f88d4b7fe85db68 [diff] |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: 5ec6622f80 am: 6b4e3060df am: db8b893118 am: ba4ce1eca9 Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1588910 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I938fde74e8b76d63ca3646617a3ae8744f024b03
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