diff options
| author | Dante Russo <drusso@codeaurora.org> | 2021-03-11 17:38:31 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-09-03 08:56:10 -0700 |
| commit | 83c75e07a27c96632ca2be15f5c4bcb9a0893f41 (patch) | |
| tree | 89176c6e5b9fc7b8884a49339e10589115e4f01e /android | |
| parent | c9560c1201d115ff372c74fed296e660139e7a76 (diff) | |
Fixes ubsan shift-out-of-bounds SIGABRT
There are now global sanitizers that will
be applied to all modules, so we no longer
need to decalre local sanitizer options.
One of the local sanitizer options caused a
ubsan shift-out-of-bounds SIGABRT in several
location modules in code that does not appear
to have anything problematic with it.
CRs-fixed: 2898374
Change-Id: Icb7e3b2cf35be7c0a945eff16cea2b3a4f30e4a8
Diffstat (limited to 'android')
| -rw-r--r-- | android/1.0/Android.mk | 4 | ||||
| -rw-r--r-- | android/1.1/Android.mk | 4 | ||||
| -rw-r--r-- | android/2.0/Android.mk | 4 | ||||
| -rw-r--r-- | android/2.1/Android.mk | 3 | ||||
| -rw-r--r-- | android/utils/Android.bp | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/android/1.0/Android.mk b/android/1.0/Android.mk index 797ecce..f63a948 100644 --- a/android/1.0/Android.mk +++ b/android/1.0/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.0-impl-qti -LOCAL_SANITIZE += $(GNSS_SANITIZE) + # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) LOCAL_VENDOR_MODULE := true @@ -58,7 +58,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.0-service-qti -LOCAL_SANITIZE += $(GNSS_SANITIZE) + # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) LOCAL_VINTF_FRAGMENTS := android.hardware.gnss@1.0-service-qti.xml diff --git a/android/1.1/Android.mk b/android/1.1/Android.mk index 66abd06..edf8547 100644 --- a/android/1.1/Android.mk +++ b/android/1.1/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.1-impl-qti -LOCAL_SANITIZE += $(GNSS_SANITIZE) + # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) LOCAL_VENDOR_MODULE := true @@ -59,7 +59,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.1-service-qti -LOCAL_SANITIZE += $(GNSS_SANITIZE) + # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) LOCAL_VINTF_FRAGMENTS := android.hardware.gnss@1.1-service-qti.xml diff --git a/android/2.0/Android.mk b/android/2.0/Android.mk index c0b91ae..e3422f9 100644 --- a/android/2.0/Android.mk +++ b/android/2.0/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@2.0-impl-qti -LOCAL_SANITIZE += $(GNSS_SANITIZE) + # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) LOCAL_VENDOR_MODULE := true @@ -71,7 +71,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@2.0-service-qti -LOCAL_SANITIZE += $(GNSS_SANITIZE) + # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) LOCAL_VINTF_FRAGMENTS := android.hardware.gnss@2.0-service-qti.xml diff --git a/android/2.1/Android.mk b/android/2.1/Android.mk index a947e41..4be97a9 100644 --- a/android/2.1/Android.mk +++ b/android/2.1/Android.mk @@ -2,7 +2,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@2.1-impl-qti -LOCAL_SANITIZE += $(GNSS_SANITIZE) # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) LOCAL_VENDOR_MODULE := true @@ -74,7 +73,7 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@2.1-service-qti -LOCAL_SANITIZE += $(GNSS_SANITIZE) + # activate the following line for debug purposes only, comment out for production #LOCAL_SANITIZE_DIAG += $(GNSS_SANITIZE_DIAG) LOCAL_VINTF_FRAGMENTS := android.hardware.gnss@2.1-service-qti.xml diff --git a/android/utils/Android.bp b/android/utils/Android.bp index c3dc17a..20fea88 100644 --- a/android/utils/Android.bp +++ b/android/utils/Android.bp @@ -3,7 +3,7 @@ cc_library_static { name: "liblocbatterylistener", vendor: true, - sanitize: GNSS_SANITIZE, + cflags: GNSS_CFLAGS + ["-DBATTERY_LISTENER_ENABLED"], local_include_dirs: ["."], |