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