diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 20:20:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 20:20:12 +0000 |
| commit | 2835c6eb3f148a02087a82a495af2549e2c8c057 (patch) | |
| tree | e3c91cd249ec301599cfb651e542def91e410125 | |
| parent | 404449cf55ec6de2f989864cf8ea2b315d651438 (diff) | |
| parent | 138ade68f9d3388a1b0a6d9ce5e091ff6f7e7448 (diff) | |
| download | chromium-trace-2835c6eb3f148a02087a82a495af2549e2c8c057.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-trace" am: 9e8dcdbd01 am: 9b991a4f5a am: b2966fd428 am: 138ade68f9android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1682245
Change-Id: Ibcecd1d39d109110c688555156051f17396583c7
| -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 |