Snap for 8570526 from 57bc99fe63a1c4ee6f38c526e6575f668a1b8e77 to mainline-mediaprovider-releaseaml_mpr_331918000aml_mpr_331812020aml_mpr_331711020aml_mpr_331613010aml_mpr_331512020aml_mpr_331412040aml_mpr_331311080aml_mpr_331112050aml_mpr_331112030aml_mpr_331011070aml_mpr_330911040aml_mpr_330811020android13-mainline-mediaprovider-release

Change-Id: I27d72ea64f4d5400f0e021f38b86f67930060d2a

3 files changed, 35 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
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..05d4892
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,7 @@
+# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+#     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+#     DEPENDING ON IT IN YOUR PROJECT. ***
+third_party {
+  license_note: "would be RESTRICTED save for invensense license: 6515/libsensors_iio/License.txt"
+  license_type: BY_EXCEPTION_ONLY
+}