diff --git a/core/Android.mk b/core/Android.mk
index 49224b1..eca28ab 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 97f7331..628e2c0 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
@@ -63,6 +66,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 2321745..4c33f32 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 674383f..734d3cd 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
@@ -63,6 +66,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 66ea2aa..0bcb08b 100644
--- a/msm8084/utils/Android.mk
+++ b/msm8084/utils/Android.mk
@@ -52,6 +52,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 d07f544..53c067b 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_VENDOR_MODULE  := true
 LOCAL_MODULE_OWNER := qcom
 
diff --git a/msm8909/etc/Android.mk b/msm8909/etc/Android.mk
index 112658d..fa8176d 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_VENDOR_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 1d66b41..bfb052f 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_VENDOR_MODULE  := true
 LOCAL_MODULE_OWNER := qcom
 
@@ -65,6 +67,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_VENDOR_MODULE  := true
 LOCAL_MODULE_OWNER := qcom
 
diff --git a/msm8909/utils/Android.mk b/msm8909/utils/Android.mk
index 386f767..c4bf763 100644
--- a/msm8909/utils/Android.mk
+++ b/msm8909/utils/Android.mk
@@ -64,6 +64,8 @@
 
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/msm8909w_3100/android/Android.mk b/msm8909w_3100/android/Android.mk
index 499f705..5cf9539 100644
--- a/msm8909w_3100/android/Android.mk
+++ b/msm8909w_3100/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_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
 LOCAL_MODULE_RELATIVE_PATH := hw
@@ -58,6 +60,8 @@
 ifeq ($(BUILD_GNSS_HIDL_SERVICE), true)
 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_PATH := $(TARGET_OUT_VENDOR_EXECUTABLES)
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_INIT_RC := android.hardware.gnss@1.0-service-qti.rc
diff --git a/msm8909w_3100/core/Android.mk b/msm8909w_3100/core/Android.mk
index 67318da..848c3f7 100644
--- a/msm8909w_3100/core/Android.mk
+++ b/msm8909w_3100/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_PATH_32 := $(TARGET_OUT_VENDOR)/lib
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
 LOCAL_MODULE_TAGS := optional
@@ -59,6 +61,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/msm8909w_3100/etc/Android.mk b/msm8909w_3100/etc/Android.mk
index 449059b..62fa3d4 100644
--- a/msm8909w_3100/etc/Android.mk
+++ b/msm8909w_3100/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/msm8909w_3100/gnss/Android.mk b/msm8909w_3100/gnss/Android.mk
index a74085b..b6629fe 100644
--- a/msm8909w_3100/gnss/Android.mk
+++ b/msm8909w_3100/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_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
 LOCAL_MODULE_TAGS := optional
diff --git a/msm8909w_3100/location/Android.mk b/msm8909w_3100/location/Android.mk
index 199c247..8f9fb11 100644
--- a/msm8909w_3100/location/Android.mk
+++ b/msm8909w_3100/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_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
 LOCAL_MODULE_TAGS := optional
@@ -36,6 +38,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/msm8909w_3100/utils/Android.mk b/msm8909w_3100/utils/Android.mk
index 5cd4c1b..b53c445 100644
--- a/msm8909w_3100/utils/Android.mk
+++ b/msm8909w_3100/utils/Android.mk
@@ -47,6 +47,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_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
 LOCAL_MODULE_TAGS := optional
@@ -59,6 +61,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/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk
index 82016a5..4524a34 100644
--- a/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk
+++ b/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk
@@ -52,6 +52,8 @@
     libloc_stub_headers
 
 LOCAL_MODULE := libloc_pla
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
 LOCAL_MODULE_TAGS := optional
@@ -62,6 +64,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)/../include
 include $(BUILD_HEADER_LIBRARY)
 
diff --git a/msm8909w_3100/utils/platform_lib_abstractions/loc_stub/src/Android.mk b/msm8909w_3100/utils/platform_lib_abstractions/loc_stub/src/Android.mk
index 08697cb..2f576d6 100644
--- a/msm8909w_3100/utils/platform_lib_abstractions/loc_stub/src/Android.mk
+++ b/msm8909w_3100/utils/platform_lib_abstractions/loc_stub/src/Android.mk
@@ -32,6 +32,8 @@
     $(LOCAL_PATH)/../include \
 
 LOCAL_MODULE := libloc_stub
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64
 LOCAL_MODULE_TAGS := optional
@@ -42,6 +44,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libloc_stub_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 include $(BUILD_HEADER_LIBRARY)
 
diff --git a/msm8960/core/Android.mk b/msm8960/core/Android.mk
index b32d589..84ebfba 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 d8f1b0d..0d08134 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
@@ -63,6 +66,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 09cd738..a2dece7 100644
--- a/msm8960/utils/Android.mk
+++ b/msm8960/utils/Android.mk
@@ -46,6 +46,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 9758c6f..2316253 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 97f7331..628e2c0 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
@@ -63,6 +66,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 66ea2aa..0bcb08b 100644
--- a/msm8994/utils/Android.mk
+++ b/msm8994/utils/Android.mk
@@ -52,6 +52,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 7f7b2b4..5e869f1 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
@@ -48,6 +50,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 3c23636..10660f5 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
 
@@ -56,12 +58,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 e0b9b32..59e78bd 100644
--- a/msm8996/utils/Android.mk
+++ b/msm8996/utils/Android.mk
@@ -46,6 +46,8 @@
 
 
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_MODULE_TAGS := optional
 
@@ -59,6 +61,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libgps.utils_headers
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libhardware_headers
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) $(LOCAL_PATH)/platform_lib_abstractions
diff --git a/msm8998/android/Android.mk b/msm8998/android/Android.mk
index 798b8e4..3d28f38 100644
--- a/msm8998/android/Android.mk
+++ b/msm8998/android/Android.mk
@@ -9,6 +9,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
@@ -55,6 +57,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 3c872a2..a444878 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 541f4de..57c3739 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 c8e462e..81959ef 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 3b1796a..f8276a2 100644
--- a/msm8998/utils/Android.mk
+++ b/msm8998/utils/Android.mk
@@ -73,6 +73,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 2eb7b1b..2f54a21 100644
--- a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
+++ b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
@@ -46,6 +46,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 0208f7f..69e85a5 100644
--- a/msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk
+++ b/msm8998/utils/platform_lib_abstractions/loc_stub/src/Android.mk
@@ -44,6 +44,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/utils/Android.mk b/utils/Android.mk
index 66ea2aa..0bcb08b 100644
--- a/utils/Android.mk
+++ b/utils/Android.mk
@@ -52,6 +52,8 @@
    loc_misc_utils.h
 
 LOCAL_MODULE := libgps.utils
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_MODULE_TAGS := optional