Snap for 8570526 from 72f214e79db46e82d3dd21a2ed7f6ba418a6505f to mainline-ipsec-releaseaml_ips_341611000aml_ips_341510000aml_ips_340914280aml_ips_340914200aml_ips_340914000aml_ips_331910010aml_ips_331312000aml_ips_331310000aml_ips_331111030aml_ips_331014020android13-mainline-ipsec-release

Change-Id: I5516d236e1d42e42fa760a48402aa2a33c322520

3 files changed, 8 insertions, 19 deletions

diff --git a/Android.mk b/Android.mk
index 1a14500..7197bf1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,15 +17,18 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := thermal.$(TARGET_BOARD_PLATFORM)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution
+LOCAL_LICENSE_CONDITIONS := by_exception_only not_allowed notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_SRC_FILES := thermal.c
 LOCAL_SRC_FILES += thermal_common.c
 
-ifeq ($(call is-board-platform-in-list,msm8998), true)
+ifneq (,$(call is-board-platform-in-list2,msm8998))
 LOCAL_SRC_FILES += thermal-8998.c
-else ifeq ($(call is-board-platform-in-list,sdm845), true)
+else ifneq (,$(call is-board-platform-in-list2,sdm845))
 LOCAL_SRC_FILES += thermal-845.c
 else
 LOCAL_SRC_FILES += thermal_target.c
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index 67a542c..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2017, The Linux Foundation. All rights reserved.
- * Not a contribution
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */