commit cca85a0e849ae02eda9e1786f377d9db575f7fc0
author Sunil Ravi <sunilravi@google.com> Thu Mar 03 00:11:34 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 03 00:11:34 2022 +0000
tree 6ca7c1d31d3a810a601d6eb15bd215dc3217fe15
parent 9864fe8b497af062fad77e2daa3b772b3cc594ae
parent 781d0d45cdecbb483caf8054cc598035a1c43fa4

Merge changes from topics "presubmit-am-199afe44c7a248abae070cf5d976833e", "presubmit-am-eae8cb1f01f04fa1bdbe809fafb5a9ff" into tm-dev

* changes:
  Allow to set IF_OPER_UP in kernel
  Fixed the number of elements passed to resolvePath()

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 8a1e6d8..0ae8207 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -8,7 +8,7 @@
 LOCAL_PATH := $(call my-dir)
 PKG_CONFIG ?= pkg-config
 
-$(eval $(call declare-copy-files-license-metadata,external/wpa_supplicant_8/wpa_supplicant,.conf,SPDX-license-identifier-BSD-3-Clause,notice,external/wpa_supplicant_8/wpa_supplicant/LICENSE_BSD,))
+$(eval $(call declare-copy-files-license-metadata,external/wpa_supplicant_8/wpa_supplicant,.conf,SPDX-license-identifier-BSD-3-Clause,notice,external/wpa_supplicant_8/LICENSE,))
 
 ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),)
   CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) := y