Merge Android Rplatform-tools-30.0.5

Bug: 168057903
Merged-In: Ibacc42681d1dbef7900940791b8620b7e4a5357a
Change-Id: Ibe659537a3b5c270a69c5d7fce9bf28fd82798b8

3 files changed, 3 insertions, 16 deletions

diff --git a/Android.mk b/Android.mk
index f1088a4..a883ad5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
+ifeq (,true)
 LOCAL_PATH := $(call my-dir)
 include $(LOCAL_PATH)/build/target_specific_features.mk
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/android/2.0/location_api/MeasurementAPIClient.cpp b/android/2.0/location_api/MeasurementAPIClient.cpp
index b87e508..04e8275 100644
--- a/android/2.0/location_api/MeasurementAPIClient.cpp
+++ b/android/2.0/location_api/MeasurementAPIClient.cpp
@@ -362,6 +362,7 @@ static void convertGnssData_1_1(GnssMeasurementsNotification& in,
 static void convertGnssData_2_0(GnssMeasurementsNotification& in,
         V2_0::IGnssMeasurementCallback::GnssData& out)
 {
+    memset(&out, 0, sizeof(V2_0::IGnssMeasurementCallback::GnssData));
     out.measurements.resize(in.count);
     for (size_t i = 0; i < in.count; i++) {
         convertGnssMeasurement(in.measurements[i], out.measurements[i].v1_1.v1_0);
diff --git a/os_pickup.bp b/os_pickup.bp
index 538c529..a16d751 100644
--- a/os_pickup.bp
+++ b/os_pickup.bp
@@ -1,17 +1,3 @@
 //hardware/qcom/sm7150/Android.bp links to this file
-bootstrap_go_package {
-    name: "soong-display_defaults_sm7150",
-    pkgPath: "android/soong/hardware/qcom/sm7150/display",
-    deps: [
-        "blueprint",
-        "blueprint-pathtools",
-        "soong",
-        "soong-android",
-        "soong-cc",
-        "soong-genrule",
-    ],
-    srcs: [
-        "display/display_defaults.go",
-    ],
-    pluginFor: ["soong_build"],
+soong_namespace {
 }