diff options
author | Bob Badour <bbadour@google.com> | 2021-02-20 17:22:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 17:22:58 +0000 |
commit | f02e206950b5e2726b6ca7e44ecd6c0a5d7c7912 (patch) | |
tree | 540e1200e06e3cd55b86295f51d4898e3992f0e5 | |
parent | 4e8e917a860ecc3021c810bdadc328bda9a9c215 (diff) | |
parent | ee3bbc703a9b890371137e3d686bf4af40f04efd (diff) | |
download | invensense-android-12.1.0_r13.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/invensense" am: 6351fd9bc2 am: d74c86f073 am: ee3bbc703aandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/hardware/invensense/+/1588040
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib69d85a26304d63949a4f01289c02281bcec182f
-rwxr-xr-x | 6515/libsensors_iio/Android.mk | 17 | ||||
-rw-r--r-- | 65xx/libsensors_iio/Android.mk | 12 |
2 files changed, 28 insertions, 1 deletions
diff --git a/6515/libsensors_iio/Android.mk b/6515/libsensors_iio/Android.mk index f894e50..fa7dcd5 100755 --- a/6515/libsensors_iio/Android.mk +++ b/6515/libsensors_iio/Android.mk @@ -19,6 +19,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libinvensense_hal +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 legacy_by_exception_only +LOCAL_LICENSE_CONDITIONS := by_exception_only notice restricted LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := invensense @@ -111,24 +113,34 @@ include $(CLEAR_VARS) ifeq ($(filter eng, userdebug, user, $(TARGET_BUILD_VARIANT)),) ifneq ($(filter manta full_grouper tilapia, $(TARGET_PRODUCT)),) LOCAL_MODULE := sensors.full_grouper +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 legacy_by_exception_only +LOCAL_LICENSE_CONDITIONS := by_exception_only notice restricted LOCAL_MODULE_OWNER := invensense else ifneq ($(filter aosp_hammerhead, $(TARGET_PRODUCT)),) LOCAL_MODULE := sensors.hammerhead +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 legacy_by_exception_only +LOCAL_LICENSE_CONDITIONS := by_exception_only notice restricted LOCAL_MODULE_OWNER := invensense else ifneq ($(filter aosp_flounder, $(TARGET_PRODUCT)),) LOCAL_MODULE := sensors.flounder +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 legacy_by_exception_only +LOCAL_LICENSE_CONDITIONS := by_exception_only notice restricted LOCAL_MODULE_OWNER := invensense endif endif ifneq ($(filter dory guppy, $(TARGET_DEVICE)),) LOCAL_MODULE := sensors.invensense +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 legacy_by_exception_only +LOCAL_LICENSE_CONDITIONS := by_exception_only notice restricted LOCAL_MODULE_OWNER := invensense endif endif else # eng, user, & userdebug builds LOCAL_MODULE := sensors.invensense +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 legacy_by_exception_only +LOCAL_LICENSE_CONDITIONS := by_exception_only notice restricted endif # eng, user & userdebug builds $(info YD>>LOCAL_MODULE=$(LOCAL_MODULE)) @@ -194,6 +206,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libmplmpu +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 legacy_by_exception_only +LOCAL_LICENSE_CONDITIONS := by_exception_only notice restricted LOCAL_SRC_FILES := libmplmpu.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := invensense @@ -206,6 +220,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := libmllite +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 legacy_by_exception_only +LOCAL_LICENSE_CONDITIONS := by_exception_only notice restricted LOCAL_SRC_FILES := libmllite.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := invensense @@ -215,4 +231,3 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/lib OVERRIDE_BUILT_MODULE_PATH := $(TARGET_OUT_INTERMEDIATE_LIBRARIES) LOCAL_STRIP_MODULE := true include $(BUILD_PREBUILT) - diff --git a/65xx/libsensors_iio/Android.mk b/65xx/libsensors_iio/Android.mk index 7c21a6a..41369f8 100644 --- a/65xx/libsensors_iio/Android.mk +++ b/65xx/libsensors_iio/Android.mk @@ -25,6 +25,8 @@ include $(CLEAR_VARS) LOCAL_CLANG_CFLAGS += $(my_ignored_clang_warnings) LOCAL_MODULE := libinvensense_hal +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := invensense @@ -100,15 +102,21 @@ include $(CLEAR_VARS) LOCAL_CLANG_CFLAGS += $(my_ignored_clang_warnings) ifneq ($(filter dory guppy guppypdk, $(TARGET_DEVICE)),) LOCAL_MODULE := sensors.invensense +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice else ifeq (,$(filter $(TARGET_BUILD_VARIANT),eng userdebug)) ifneq ($(filter manta grouper tilapia, $(TARGET_DEVICE)),) #LOCAL_MODULE := sensors.invensense else LOCAL_MODULE := sensors.${TARGET_PRODUCT} +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice endif else # eng & userdebug builds LOCAL_MODULE := sensors.${TARGET_PRODUCT} +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice endif # eng & userdebug builds endif # !guppy LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw @@ -168,6 +176,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libmplmpu +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SRC_FILES := libmplmpu.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := invensense @@ -180,6 +190,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := libmllite +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SRC_FILES := libmllite.so LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := invensense |