diff --git a/core/Android.mk b/core/Android.mk
index 859ac03..826a82c 100644
--- a/core/Android.mk
+++ b/core/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_core
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/etc/Android.mk b/etc/Android.mk
index fef8963..3225c56 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -3,6 +3,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.conf
+LOCAL_LICENSE_KINDS := legacy_notice
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)/
diff --git a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
index bb3d924..9085e4f 100644
--- a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
+++ b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
@@ -53,6 +53,9 @@
     $(RPC_INC)/LocApiRpc.h
 
 LOCAL_MODULE:= libloc_api-rpc-qc
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
+LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
index c0987e6..4db0713 100644
--- a/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
+++ b/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
@@ -7,6 +7,9 @@
 LOC_RPCGEN_APIS_PATH_FL := ../../../../../$(TARGET_OUT_INTERMEDIATES)/loc_api/libloc_api_rpcgen_intermediates
 
 LOCAL_MODULE := libloc_api_rpcgen
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/loc_api/libloc_api-rpc/Android.mk b/loc_api/libloc_api-rpc/Android.mk
index 06e4694..c98e3b3 100644
--- a/loc_api/libloc_api-rpc/Android.mk
+++ b/loc_api/libloc_api-rpc/Android.mk
@@ -53,6 +53,9 @@
 	$(TARGET_OUT_HEADERS)/librpc
 
 LOCAL_MODULE:= libloc_api-rpc
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
+LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/loc_api/libloc_api_50001/Android.mk b/loc_api/libloc_api_50001/Android.mk
index 4992540..1fd847f 100644
--- a/loc_api/libloc_api_50001/Android.mk
+++ b/loc_api/libloc_api_50001/Android.mk
@@ -6,6 +6,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_eng
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
@@ -62,6 +65,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.$(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8084/core/Android.mk b/msm8084/core/Android.mk
index e1df540..e21ad2f 100644
--- a/msm8084/core/Android.mk
+++ b/msm8084/core/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_core
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8084/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk b/msm8084/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
index bb3d924..9085e4f 100644
--- a/msm8084/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
+++ b/msm8084/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
@@ -53,6 +53,9 @@
     $(RPC_INC)/LocApiRpc.h
 
 LOCAL_MODULE:= libloc_api-rpc-qc
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
+LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8084/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk b/msm8084/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
index c0987e6..4db0713 100644
--- a/msm8084/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
+++ b/msm8084/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
@@ -7,6 +7,9 @@
 LOC_RPCGEN_APIS_PATH_FL := ../../../../../$(TARGET_OUT_INTERMEDIATES)/loc_api/libloc_api_rpcgen_intermediates
 
 LOCAL_MODULE := libloc_api_rpcgen
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/msm8084/loc_api/libloc_api-rpc/Android.mk b/msm8084/loc_api/libloc_api-rpc/Android.mk
index 06e4694..c98e3b3 100644
--- a/msm8084/loc_api/libloc_api-rpc/Android.mk
+++ b/msm8084/loc_api/libloc_api-rpc/Android.mk
@@ -53,6 +53,9 @@
 	$(TARGET_OUT_HEADERS)/librpc
 
 LOCAL_MODULE:= libloc_api-rpc
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
+LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/msm8084/loc_api/libloc_api_50001/Android.mk b/msm8084/loc_api/libloc_api_50001/Android.mk
index 87b248e..c7433a8 100644
--- a/msm8084/loc_api/libloc_api_50001/Android.mk
+++ b/msm8084/loc_api/libloc_api_50001/Android.mk
@@ -6,6 +6,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_eng
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
@@ -62,6 +65,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.$(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8084/utils/Android.mk b/msm8084/utils/Android.mk
index f34e101..2765e36 100644
--- a/msm8084/utils/Android.mk
+++ b/msm8084/utils/Android.mk
@@ -51,6 +51,8 @@
    loc_misc_utils.h
 
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/msm8909/core/Android.mk b/msm8909/core/Android.mk
index 8b998b6..eda9515 100644
--- a/msm8909/core/Android.mk
+++ b/msm8909/core/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_core
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8909/etc/Android.mk b/msm8909/etc/Android.mk
index 33287df..ff968e7 100644
--- a/msm8909/etc/Android.mk
+++ b/msm8909/etc/Android.mk
@@ -5,6 +5,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.conf
+LOCAL_LICENSE_KINDS := legacy_notice
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)/
diff --git a/msm8909/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk b/msm8909/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
index bb3d924..d44ca47 100644
--- a/msm8909/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
+++ b/msm8909/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
@@ -53,6 +53,8 @@
     $(RPC_INC)/LocApiRpc.h
 
 LOCAL_MODULE:= libloc_api-rpc-qc
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8909/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk b/msm8909/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
index c0987e6..3b0eeda 100644
--- a/msm8909/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
+++ b/msm8909/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
@@ -7,6 +7,8 @@
 LOC_RPCGEN_APIS_PATH_FL := ../../../../../$(TARGET_OUT_INTERMEDIATES)/loc_api/libloc_api_rpcgen_intermediates
 
 LOCAL_MODULE := libloc_api_rpcgen
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/msm8909/loc_api/libloc_api_50001/Android.mk b/msm8909/loc_api/libloc_api_50001/Android.mk
index 08835d6..7b4ed78 100644
--- a/msm8909/loc_api/libloc_api_50001/Android.mk
+++ b/msm8909/loc_api/libloc_api_50001/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_eng
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
@@ -63,6 +65,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.$(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8909/utils/Android.mk b/msm8909/utils/Android.mk
index b7e30fb..b550823 100644
--- a/msm8909/utils/Android.mk
+++ b/msm8909/utils/Android.mk
@@ -60,6 +60,8 @@
    loc_misc_utils.h
 
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/msm8960/core/Android.mk b/msm8960/core/Android.mk
index dc2b31a..b2d8e0e 100644
--- a/msm8960/core/Android.mk
+++ b/msm8960/core/Android.mk
@@ -3,6 +3,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_core
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8960/etc/Android.mk b/msm8960/etc/Android.mk
index 427b5c8..f048a72 100644
--- a/msm8960/etc/Android.mk
+++ b/msm8960/etc/Android.mk
@@ -5,6 +5,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.conf
+LOCAL_LICENSE_KINDS := legacy_notice
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)/
diff --git a/msm8960/loc_api/libloc_api_50001/Android.mk b/msm8960/loc_api/libloc_api_50001/Android.mk
index 9f60c5d..3d0ed72 100644
--- a/msm8960/loc_api/libloc_api_50001/Android.mk
+++ b/msm8960/loc_api/libloc_api_50001/Android.mk
@@ -6,6 +6,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_eng
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
@@ -62,6 +65,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.$(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8960/utils/Android.mk b/msm8960/utils/Android.mk
index 18c7ccc..96e74b8 100644
--- a/msm8960/utils/Android.mk
+++ b/msm8960/utils/Android.mk
@@ -45,6 +45,8 @@
 
 
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/msm8994/core/Android.mk b/msm8994/core/Android.mk
index a8b8995..e860712 100644
--- a/msm8994/core/Android.mk
+++ b/msm8994/core/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_core
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8994/etc/Android.mk b/msm8994/etc/Android.mk
index fef8963..3225c56 100644
--- a/msm8994/etc/Android.mk
+++ b/msm8994/etc/Android.mk
@@ -3,6 +3,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.conf
+LOCAL_LICENSE_KINDS := legacy_notice
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)/
diff --git a/msm8994/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk b/msm8994/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
index bb3d924..9085e4f 100644
--- a/msm8994/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
+++ b/msm8994/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
@@ -53,6 +53,9 @@
     $(RPC_INC)/LocApiRpc.h
 
 LOCAL_MODULE:= libloc_api-rpc-qc
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
+LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8994/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk b/msm8994/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
index c0987e6..4db0713 100644
--- a/msm8994/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
+++ b/msm8994/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
@@ -7,6 +7,9 @@
 LOC_RPCGEN_APIS_PATH_FL := ../../../../../$(TARGET_OUT_INTERMEDIATES)/loc_api/libloc_api_rpcgen_intermediates
 
 LOCAL_MODULE := libloc_api_rpcgen
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_SHARED_LIBRARIES := \
diff --git a/msm8994/loc_api/libloc_api-rpc/Android.mk b/msm8994/loc_api/libloc_api-rpc/Android.mk
index 06e4694..c98e3b3 100644
--- a/msm8994/loc_api/libloc_api-rpc/Android.mk
+++ b/msm8994/loc_api/libloc_api-rpc/Android.mk
@@ -53,6 +53,9 @@
 	$(TARGET_OUT_HEADERS)/librpc
 
 LOCAL_MODULE:= libloc_api-rpc
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
+LOCAL_NOTICE_FILE:= $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/msm8994/loc_api/libloc_api_50001/Android.mk b/msm8994/loc_api/libloc_api_50001/Android.mk
index 4992540..1fd847f 100644
--- a/msm8994/loc_api/libloc_api_50001/Android.mk
+++ b/msm8994/loc_api/libloc_api_50001/Android.mk
@@ -6,6 +6,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_eng
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
@@ -62,6 +65,9 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.$(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8994/utils/Android.mk b/msm8994/utils/Android.mk
index f34e101..2765e36 100644
--- a/msm8994/utils/Android.mk
+++ b/msm8994/utils/Android.mk
@@ -51,6 +51,8 @@
    loc_misc_utils.h
 
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/msm8996/core/Android.mk b/msm8996/core/Android.mk
index fac5092..2808dd1 100644
--- a/msm8996/core/Android.mk
+++ b/msm8996/core/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_core
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
@@ -47,6 +49,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libloc_core_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_HEADER_LIBRARY)
 
diff --git a/msm8996/etc/Android.mk b/msm8996/etc/Android.mk
index d439494..5df9559 100644
--- a/msm8996/etc/Android.mk
+++ b/msm8996/etc/Android.mk
@@ -3,6 +3,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.conf
+LOCAL_LICENSE_KINDS := legacy_notice
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/
diff --git a/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk b/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
index 70d3e85..528a010 100644
--- a/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
+++ b/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk
@@ -46,6 +46,8 @@
 
 
 LOCAL_MODULE:= libloc_api-rpc-qc
+LOCAL_LICENSE_KINDS:= SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS:= notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
@@ -55,5 +57,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libloc_api-rpc-qc_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH/$(RPC_INC))
 include $(BUILD_HEADER_LIBRARY)
diff --git a/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk b/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
index 1c2b16b..6d76d2d 100644
--- a/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
+++ b/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk
@@ -7,6 +7,8 @@
 LOC_RPCGEN_APIS_PATH_FL := ../../../../../$(TARGET_OUT_INTERMEDIATES)/loc_api/libloc_api_rpcgen_intermediates
 
 LOCAL_MODULE := libloc_api_rpcgen
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 
 LOCAL_SHARED_LIBRARIES := \
@@ -31,5 +33,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libloc_api_rpcgen_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc
 include $(BUILD_HEADER_LIBRARY)
diff --git a/msm8996/loc_api/libloc_api_50001/Android.mk b/msm8996/loc_api/libloc_api_50001/Android.mk
index c517a23..58ec989 100644
--- a/msm8996/loc_api/libloc_api_50001/Android.mk
+++ b/msm8996/loc_api/libloc_api_50001/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_eng
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 LOCAL_PROPRIETARY_MODULE := true
 
@@ -55,12 +57,16 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libloc_eng_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_HEADER_LIBRARY)
 
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.$(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE)
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_OWNER := qcom
 LOCAL_PROPRIETARY_MODULE := true
 
diff --git a/msm8996/utils/Android.mk b/msm8996/utils/Android.mk
index f347d47..d0ddf1a 100644
--- a/msm8996/utils/Android.mk
+++ b/msm8996/utils/Android.mk
@@ -42,6 +42,8 @@
 
 
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_MODULE_TAGS := optional
 
@@ -55,6 +57,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libgps.utils_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) $(LOCAL_PATH)/platform_lib_abstractions
 include $(BUILD_HEADER_LIBRARY)
 
diff --git a/msm8998/android/Android.mk b/msm8998/android/Android.mk
index 81e455d..142fdc8 100644
--- a/msm8998/android/Android.mk
+++ b/msm8998/android/Android.mk
@@ -2,6 +2,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := android.hardware.gnss@1.0-impl-qti
+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_VENDOR_MODULE := true
 LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_RELATIVE_PATH := hw
@@ -47,6 +49,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := android.hardware.gnss@1.0-service-qti
+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_MODULE_OWNER := qti
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_INIT_RC := android.hardware.gnss@1.0-service-qti.rc
diff --git a/msm8998/core/Android.mk b/msm8998/core/Android.mk
index b8d497e..be7ab7b 100644
--- a/msm8998/core/Android.mk
+++ b/msm8998/core/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_core
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8998/etc/Android.mk b/msm8998/etc/Android.mk
index d9eb0e1..3dcfffa 100644
--- a/msm8998/etc/Android.mk
+++ b/msm8998/etc/Android.mk
@@ -3,10 +3,11 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gps.conf
+LOCAL_LICENSE_KINDS := legacy_notice
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR)/etc/
 LOCAL_SRC_FILES := gps.conf
 
 include $(BUILD_PREBUILT)
-
diff --git a/msm8998/gnss/Android.mk b/msm8998/gnss/Android.mk
index fd8ceaa..cc5b660 100644
--- a/msm8998/gnss/Android.mk
+++ b/msm8998/gnss/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libgnss
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8998/location/Android.mk b/msm8998/location/Android.mk
index b414338..f97f4f5 100644
--- a/msm8998/location/Android.mk
+++ b/msm8998/location/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := liblocation_api
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8998/utils/Android.mk b/msm8998/utils/Android.mk
index b97dad3..07999a2 100644
--- a/msm8998/utils/Android.mk
+++ b/msm8998/utils/Android.mk
@@ -66,6 +66,8 @@
    loc_gps.h
 
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
index c029bc7..b1a1207 100644
--- a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
+++ b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
@@ -43,6 +43,8 @@
         ../include/platform_lib_time.h
 
 LOCAL_MODULE := libloc_pla
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := qti
diff --git a/msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk b/msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk
index 0b1132c..3393b64 100644
--- a/msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk
+++ b/msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk
@@ -41,6 +41,8 @@
         ../include/loc_stub_time.h
 
 LOCAL_MODULE := libloc_stub
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
diff --git a/sdm845/android/Android.mk b/sdm845/android/Android.mk
index e517359..e908136 100644
--- a/sdm845/android/Android.mk
+++ b/sdm845/android/Android.mk
@@ -2,6 +2,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := android.hardware.gnss@1.1-impl-qti
+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_VENDOR_MODULE := true
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SRC_FILES := \
@@ -58,6 +60,8 @@
 ifeq ($(BUILD_GNSS_HIDL_SERVICE), true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := android.hardware.gnss@1.1-service-qti
+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_VENDOR_MODULE := true
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_INIT_RC := android.hardware.gnss@1.1-service-qti.rc
diff --git a/sdm845/core/Android.mk b/sdm845/core/Android.mk
index 46f5fab..2b064ac 100644
--- a/sdm845/core/Android.mk
+++ b/sdm845/core/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libloc_core
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 
@@ -55,6 +57,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libloc_core_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/data-items \
diff --git a/sdm845/gnss/Android.mk b/sdm845/gnss/Android.mk
index d809bc2..26adaaf 100644
--- a/sdm845/gnss/Android.mk
+++ b/sdm845/gnss/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libgnss
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 
diff --git a/sdm845/location/Android.mk b/sdm845/location/Android.mk
index 38dea0a..4925676 100644
--- a/sdm845/location/Android.mk
+++ b/sdm845/location/Android.mk
@@ -6,6 +6,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := liblocation_api
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 
@@ -35,6 +37,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := liblocation_api_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_HEADER_LIBRARY)
 
diff --git a/sdm845/pla/Android.mk b/sdm845/pla/Android.mk
index ce062bb..b54ee7f 100644
--- a/sdm845/pla/Android.mk
+++ b/sdm845/pla/Android.mk
@@ -23,6 +23,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libloc_pla_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/android
 include $(BUILD_HEADER_LIBRARY)
 
diff --git a/sdm845/utils/Android.mk b/sdm845/utils/Android.mk
index 40c3bbb..6547e04 100644
--- a/sdm845/utils/Android.mk
+++ b/sdm845/utils/Android.mk
@@ -52,6 +52,8 @@
     liblocation_api_headers
 
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 
@@ -63,6 +65,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libgps.utils_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_HEADER_LIBRARY)
 
diff --git a/utils/Android.mk b/utils/Android.mk
index f224b18..4e46486 100644
--- a/utils/Android.mk
+++ b/utils/Android.mk
@@ -56,6 +56,8 @@
    loc_misc_utils.h
 
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_MODULE_TAGS := optional