diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-28 23:01:38 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-28 23:01:38 +0000 |
commit | 17fa8435fa2ac5d84695f972fe9d95271a6bd8b9 (patch) | |
tree | 5561ca57639650f9893e926183c235676ced22c8 | |
parent | 20e6a9f051b39f01c4d55ff2e2f43c1eba5ec202 (diff) | |
parent | c768eebe89d3a1ae2f89586430c945dfc0f9095b (diff) | |
download | armnn-android12-d1-s4-release.tar.gz |
Snap for 7240964 from c768eebe89d3a1ae2f89586430c945dfc0f9095b to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release
Change-Id: I5c31d88a9d9e1fe4c5e166dbe7a20819691a468a
-rw-r--r-- | Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 3cfe5e3ca..7ca307c5a 100644 --- a/Android.mk +++ b/Android.mk @@ -33,6 +33,9 @@ ARMNN_BACKEND_MAKEFILE_DIRS := $(subst /backend.mk,,$(ARMNN_BACKEND_MAKEFILE_PAT include $(CLEAR_VARS) LOCAL_MODULE := libarmnn +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-MIT SPDX-license-identifier-PSF-2.0 legacy_unencumbered +LOCAL_LICENSE_CONDITIONS := notice unencumbered +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE Q_OR_LATER := 1 CPP_VERSION := c++17 ifeq ($(Q_OR_LATER),1) @@ -288,6 +291,9 @@ BUILD_TESTS := 0 ifeq ($(BUILD_TESTS),1) LOCAL_MODULE := armnn-tests +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSL-1.0 SPDX-license-identifier-MIT SPDX-license-identifier-PSF-2.0 legacy_unencumbered +LOCAL_LICENSE_CONDITIONS := notice unencumbered +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE ifeq ($(Q_OR_LATER),1) # "eng" is deprecated in Android Q LOCAL_MODULE_TAGS := optional |