From c64137ec20294ad8d78c704a6ed423a7a2554a59 Mon Sep 17 00:00:00 2001 From: Dante Russo Date: Sun, 22 Mar 2020 19:33:23 +0800 Subject: Fix odcpi feature when Location is off in settings Assure gnssInterface is initialized during call to getGnssInterface to assure GnssAdapter is created and able to accept calls like odcpiInit Bug: 152261445 Test: Verified ODCPI is initialized at boot-up with location settings off. CR-fixed: 2644833 Change-Id: I60adea4d9a0d174244b2441ce14093daf5c20efb (cherry picked from commit 7fcd884a21b25b40fb8054a8dfcd895442b3266b) --- gnss/location_gnss.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/gnss/location_gnss.cpp b/gnss/location_gnss.cpp index 97e99e4..c3ea105 100644 --- a/gnss/location_gnss.cpp +++ b/gnss/location_gnss.cpp @@ -140,6 +140,7 @@ extern "C" const GnssInterface* getGnssInterface() const GnssInterface* getGnssInterface() #endif // DEBUG_X86 { + gGnssInterface.initialize(); return &gGnssInterface; } -- cgit v1.2.3 From d88785a8a3ac91f573a1c09c5c6cdbee3b23b9c1 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Sun, 28 Jun 2020 14:55:24 -0700 Subject: Add METADATA to gps: BSD+Apache2=NOTICE Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Exempt-From-Owner-Approval: janitorial work Change-Id: Ied87481ae38c80683f9c814232e64f9032139bed --- METADATA | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 METADATA 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 +} -- cgit v1.2.3 From a6d81cf4db60566cc835a7b1e6e0080c7c47a0e4 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Mon, 1 Mar 2021 22:02:46 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gps Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: utils/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: android/1.0/Android.mk android/1.1/Android.mk android/2.0/Android.mk Added SPDX-license-identifier-BSD to: android/utils/Android.mk batching/Android.mk core/Android.mk geofence/Android.mk gnss/Android.mk location/Android.mk pla/Android.mk Added legacy_notice to: etc/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I07267e93ebfc743a0d1e99a8a7853058b0de4c9c --- android/1.0/Android.mk | 4 ++++ android/1.1/Android.mk | 4 ++++ android/2.0/Android.mk | 4 ++++ android/utils/Android.mk | 6 ++++-- batching/Android.mk | 2 ++ core/Android.mk | 4 ++++ etc/Android.mk | 4 ++++ geofence/Android.mk | 3 ++- gnss/Android.mk | 2 ++ location/Android.mk | 4 ++++ pla/Android.mk | 2 ++ utils/Android.mk | 4 ++++ 12 files changed, 40 insertions(+), 3 deletions(-) diff --git a/android/1.0/Android.mk b/android/1.0/Android.mk index 797ecce..3ef99da 100644 --- a/android/1.0/Android.mk +++ b/android/1.0/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) 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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -58,6 +60,8 @@ include $(BUILD_SHARED_LIBRARY) 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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/android/1.1/Android.mk b/android/1.1/Android.mk index 66abd06..befedcb 100644 --- a/android/1.1/Android.mk +++ b/android/1.1/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) 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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -59,6 +61,8 @@ include $(BUILD_SHARED_LIBRARY) 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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/android/2.0/Android.mk b/android/2.0/Android.mk index b6790c5..06738f1 100644 --- a/android/2.0/Android.mk +++ b/android/2.0/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@2.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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -71,6 +73,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@2.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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/android/utils/Android.mk b/android/utils/Android.mk index 9cb6f7b..ca7ae60 100644 --- a/android/utils/Android.mk +++ b/android/utils/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := liblocbatterylistener +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -34,8 +36,8 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := liblocbatterylistener_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/batching/Android.mk b/batching/Android.mk index b4876cd..8ffa7b5 100644 --- a/batching/Android.mk +++ b/batching/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libbatching +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/core/Android.mk b/core/Android.mk index ce5d6a8..df533de 100644 --- a/core/Android.mk +++ b/core/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libloc_core +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -51,6 +53,8 @@ include $(BUILD_SHARED_LIBRARY) 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/etc/Android.mk b/etc/Android.mk index 6746876..b41547a 100644 --- a/etc/Android.mk +++ b/etc/Android.mk @@ -3,6 +3,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := gps.conf +LOCAL_LICENSE_KINDS := legacy_notice +LOCAL_LICENSE_CONDITIONS := notice LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC @@ -12,6 +14,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := flp.conf +LOCAL_LICENSE_KINDS := legacy_notice +LOCAL_LICENSE_CONDITIONS := notice LOCAL_VENDOR_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC diff --git a/geofence/Android.mk b/geofence/Android.mk index 7e0e34e..03d74dc 100644 --- a/geofence/Android.mk +++ b/geofence/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libgeofencing +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -36,4 +38,3 @@ include $(BUILD_SHARED_LIBRARY) endif # not BUILD_TINY_ANDROID endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE - diff --git a/gnss/Android.mk b/gnss/Android.mk index c1b5944..d99720a 100644 --- a/gnss/Android.mk +++ b/gnss/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libgnss +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/location/Android.mk b/location/Android.mk index 2a59541..4521edb 100644 --- a/location/Android.mk +++ b/location/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := liblocation_api +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -37,6 +39,8 @@ include $(BUILD_SHARED_LIBRARY) 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/pla/Android.mk b/pla/Android.mk index a57861d..ffc25b5 100644 --- a/pla/Android.mk +++ b/pla/Android.mk @@ -22,6 +22,8 @@ LOCAL_PATH := $(call my-dir) 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/utils/Android.mk b/utils/Android.mk index 57d485d..b3eb518 100644 --- a/utils/Android.mk +++ b/utils/Android.mk @@ -48,6 +48,8 @@ LOCAL_HEADER_LIBRARIES := \ 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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -62,6 +64,8 @@ include $(BUILD_SHARED_LIBRARY) 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) -- cgit v1.2.3 From f79f0a1d98a7f69edd6846369f621168d80eebbf Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Sun, 28 Mar 2021 19:42:44 -0700 Subject: [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm7150/gps Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: etc/Android.mk utils/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: android/1.0/Android.mk android/1.1/Android.mk android/2.0/Android.mk Added SPDX-license-identifier-BSD to: android/utils/Android.mk batching/Android.mk core/Android.mk geofence/Android.mk gnss/Android.mk location/Android.mk pla/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I1f3eb010350adafd89a97bf00cbf1439d46bafdf Merged-in: I1f3eb010350adafd89a97bf00cbf1439d46bafdf Merged-in: I07267e93ebfc743a0d1e99a8a7853058b0de4c9c --- android/1.0/Android.mk | 4 ++++ android/1.1/Android.mk | 4 ++++ android/2.0/Android.mk | 4 ++++ android/utils/Android.mk | 6 ++++-- batching/Android.mk | 2 ++ core/Android.mk | 4 ++++ etc/Android.mk | 4 ++++ geofence/Android.mk | 3 ++- gnss/Android.mk | 2 ++ location/Android.mk | 4 ++++ pla/Android.mk | 2 ++ utils/Android.mk | 4 ++++ 12 files changed, 40 insertions(+), 3 deletions(-) diff --git a/android/1.0/Android.mk b/android/1.0/Android.mk index 797ecce..3ef99da 100644 --- a/android/1.0/Android.mk +++ b/android/1.0/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) 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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -58,6 +60,8 @@ include $(BUILD_SHARED_LIBRARY) 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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/android/1.1/Android.mk b/android/1.1/Android.mk index 66abd06..befedcb 100644 --- a/android/1.1/Android.mk +++ b/android/1.1/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) 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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -59,6 +61,8 @@ include $(BUILD_SHARED_LIBRARY) 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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/android/2.0/Android.mk b/android/2.0/Android.mk index b6790c5..06738f1 100644 --- a/android/2.0/Android.mk +++ b/android/2.0/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@2.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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -71,6 +73,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@2.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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/android/utils/Android.mk b/android/utils/Android.mk index 9cb6f7b..ca7ae60 100644 --- a/android/utils/Android.mk +++ b/android/utils/Android.mk @@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := liblocbatterylistener +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -34,8 +36,8 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := liblocbatterylistener_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/batching/Android.mk b/batching/Android.mk index b4876cd..8ffa7b5 100644 --- a/batching/Android.mk +++ b/batching/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libbatching +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/core/Android.mk b/core/Android.mk index ce5d6a8..df533de 100644 --- a/core/Android.mk +++ b/core/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libloc_core +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -51,6 +53,8 @@ include $(BUILD_SHARED_LIBRARY) 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/etc/Android.mk b/etc/Android.mk index 6746876..1a80c6e 100644 --- a/etc/Android.mk +++ b/etc/Android.mk @@ -3,6 +3,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := gps.conf +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 LOCAL_MODULE_CLASS := ETC @@ -12,6 +14,8 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := flp.conf +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 LOCAL_MODULE_CLASS := ETC diff --git a/geofence/Android.mk b/geofence/Android.mk index 7e0e34e..03d74dc 100644 --- a/geofence/Android.mk +++ b/geofence/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libgeofencing +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -36,4 +38,3 @@ include $(BUILD_SHARED_LIBRARY) endif # not BUILD_TINY_ANDROID endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE - diff --git a/gnss/Android.mk b/gnss/Android.mk index c1b5944..d99720a 100644 --- a/gnss/Android.mk +++ b/gnss/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libgnss +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) diff --git a/location/Android.mk b/location/Android.mk index 2a59541..4521edb 100644 --- a/location/Android.mk +++ b/location/Android.mk @@ -6,6 +6,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := liblocation_api +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -37,6 +39,8 @@ include $(BUILD_SHARED_LIBRARY) 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/pla/Android.mk b/pla/Android.mk index a57861d..ffc25b5 100644 --- a/pla/Android.mk +++ b/pla/Android.mk @@ -22,6 +22,8 @@ LOCAL_PATH := $(call my-dir) 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/utils/Android.mk b/utils/Android.mk index 57d485d..b3eb518 100644 --- a/utils/Android.mk +++ b/utils/Android.mk @@ -48,6 +48,8 @@ LOCAL_HEADER_LIBRARIES := \ 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_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) @@ -62,6 +64,8 @@ include $(BUILD_SHARED_LIBRARY) 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) -- cgit v1.2.3