diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-16 23:02:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 23:02:25 +0000 |
| commit | ba4ce1eca931c7304734497d7f88d4b7fe85db68 (patch) | |
| tree | 4f756f2cdefece987680e3c1aaf1c770b2e3ac98 | |
| parent | 4048661401a3b57073f88028b9233cbca0a6f05a (diff) | |
| parent | db8b893118075fb9aad7026fa22d1c10d9ae659b (diff) | |
| download | chromium-trace-ba4ce1eca931c7304734497d7f88d4b7fe85db68.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: 5ec6622f80 am: 6b4e3060df am: db8b893118
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1588910
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ef4667228e2a46aa5c9a5582b19b68814b5a301
| -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 |