diff --git a/gps/brcm/Android.bp b/gps/brcm/Android.bp
deleted file mode 100644
index c7077f7..0000000
--- a/gps/brcm/Android.bp
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (C) 2020 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_prebuilt_library_shared {
- name: "android.hardware.gnss@2.1-impl-google",
- arch: {
- arm64: {
- srcs: ["bin/android.hardware.gnss@2.1-impl-google.so"],
- shared_libs: [
- "liblog",
- "libhidlbase",
- // "libhidltransport",
- "libutils",
- "android.hardware.gnss@1.0",
- "android.hardware.gnss@1.1",
- "android.hardware.gnss@2.0",
- "android.hardware.gnss@2.1",
- "android.hardware.gnss.measurement_corrections@1.0",
- "android.hardware.gnss.visibility_control@1.0",
- "android.hardware.gnss-V2-ndk",
- "libhardware",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- vendor: true,
- relative_install_path: "hw",
- strip: {
- none: true,
- },
- // Bypass because libhidltransport is deprecated
- check_elf_files: false,
-}
-
-cc_prebuilt_binary {
- name: "android.hardware.gnss@2.1-service-brcm",
- init_rc: ["init.gps.rc"],
- arch: {
- arm64: {
- srcs: ["bin/android.hardware.gnss@2.1-service-brcm"],
- shared_libs: [
- "liblog",
- "libutils",
- "libhardware",
- "android.hardware.gnss@1.0",
- "libhidlbase",
- "android.hardware.gnss@1.1",
- "android.hardware.gnss@2.0",
- "android.hardware.gnss@2.1",
- "android.hardware.gnss-V2-ndk",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- vendor: true,
- relative_install_path: "hw",
- strip: {
- none: true,
- },
- // Bypass because libhidltransport is deprecated
- // Bypass because libhwbinder is deprecated
- check_elf_files: false,
- vintf_fragments: ["android.hardware.gnss@2.1-service-brcm.xml"]
-}
-
-cc_prebuilt_library_shared {
- name: "flp.default",
- arch: {
- arm64: {
- srcs: ["bin/flp.default.so"],
- shared_libs: [
- "liblog",
- "libcutils",
- "libutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- vendor: true,
- relative_install_path: "hw",
- strip: {
- none: true,
- },
- // Bypass because soname mismatch
- check_elf_files: false,
-}
-
-cc_prebuilt_binary {
- name: "gpsd",
- arch: {
- arm64: {
- srcs: ["bin/gpsd"],
- shared_libs: [
- "liblog",
- "libutils",
- "libhardware_legacy",
- "libcutils",
- "libssl",
- "libcrypto",
- "android.frameworks.sensorservice@1.0",
- "libhidlbase",
- "libandroid_net",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- vendor: true,
- relative_install_path: "hw",
- strip: {
- none: true,
- },
- // Bypass because libsitril-gps is Android.mk module
- check_elf_files: false,
-}
-
-cc_prebuilt_library_shared {
- name: "gps.default",
- arch: {
- arm64: {
- srcs: ["bin/gps.default.so"],
- shared_libs: [
- "liblog",
- "libcutils",
- "libutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- vendor: true,
- relative_install_path: "hw",
- strip: {
- none: true,
- },
- // Bypass because soname mismatch
- check_elf_files: false,
-}
-
-cc_prebuilt_binary {
- name: "lhd",
- arch: {
- arm64: {
- srcs: ["bin/lhd"],
- shared_libs: [
- "liblog",
- "libutils",
- "libhardware_legacy",
- "libc++",
- "libc",
- "libm",
- "libz",
- "android.hardware.contexthub@1.0",
- "libhidlbase",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- vendor: true,
- relative_install_path: "hw",
- strip: {
- none: true,
- },
-}
-
-cc_prebuilt_binary {
- name: "scd",
- arch: {
- arm64: {
- srcs: ["bin/scd"],
- shared_libs: [
- "liblog",
- "libutils",
- "libssl",
- "libcrypto",
- "libandroid_net",
- ],
- },
- },
- compile_multilib: "64",
- vendor: true,
- relative_install_path: "hw",
- strip: {
- none: true,
- },
-}
diff --git a/gps/brcm/android.hardware.gnss@2.1-service-brcm.xml b/gps/brcm/android.hardware.gnss@2.1-service-brcm.xml
deleted file mode 100644
index 97538b8..0000000
--- a/gps/brcm/android.hardware.gnss@2.1-service-brcm.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- android.hardware.gnss
- 2
- IGnss/default
-
-
diff --git a/gps/brcm/bin/android.hardware.gnss@2.1-impl-google.so b/gps/brcm/bin/android.hardware.gnss@2.1-impl-google.so
deleted file mode 100755
index 53f8a7d..0000000
Binary files a/gps/brcm/bin/android.hardware.gnss@2.1-impl-google.so and /dev/null differ
diff --git a/gps/brcm/bin/android.hardware.gnss@2.1-service-brcm b/gps/brcm/bin/android.hardware.gnss@2.1-service-brcm
deleted file mode 100755
index 58df6c6..0000000
Binary files a/gps/brcm/bin/android.hardware.gnss@2.1-service-brcm and /dev/null differ
diff --git a/gps/brcm/bin/flp.default.so b/gps/brcm/bin/flp.default.so
deleted file mode 100755
index 5927607..0000000
Binary files a/gps/brcm/bin/flp.default.so and /dev/null differ
diff --git a/gps/brcm/bin/gps.default.so b/gps/brcm/bin/gps.default.so
deleted file mode 100755
index 343e47e..0000000
Binary files a/gps/brcm/bin/gps.default.so and /dev/null differ
diff --git a/gps/brcm/bin/gpsd b/gps/brcm/bin/gpsd
deleted file mode 100755
index c39f6ac..0000000
Binary files a/gps/brcm/bin/gpsd and /dev/null differ
diff --git a/gps/brcm/bin/lhd b/gps/brcm/bin/lhd
deleted file mode 100755
index 019a703..0000000
Binary files a/gps/brcm/bin/lhd and /dev/null differ
diff --git a/gps/brcm/bin/scd b/gps/brcm/bin/scd
deleted file mode 100755
index 9dd12b5..0000000
Binary files a/gps/brcm/bin/scd and /dev/null differ
diff --git a/gps/brcm/device.mk b/gps/brcm/device.mk
index f44f37d..e9dcf3d 100644
--- a/gps/brcm/device.mk
+++ b/gps/brcm/device.mk
@@ -1,15 +1,9 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy
-PRODUCT_COPY_FILES += \
- device/google/gs-common/gps/brcm/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch
+
+PRODUCT_SOONG_NAMESPACES += vendor/broadcom/gps/bcm47765
PRODUCT_PACKAGES += \
- android.hardware.gnss@2.1-impl-google \
- gps.default \
- flp.default \
- gpsd \
- lhd \
- scd \
- android.hardware.gnss@2.1-service-brcm \
+ bcm47765_gps_package \
android.hardware.location.gps.prebuilt.xml
PRODUCT_PACKAGES_DEBUG += \
diff --git a/gps/brcm/firmware/SensorHub.patch b/gps/brcm/firmware/SensorHub.patch
deleted file mode 100644
index be98bf3..0000000
--- a/gps/brcm/firmware/SensorHub.patch
+++ /dev/null
@@ -1,7050 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gps/brcm/init.gps.rc b/gps/brcm/init.gps.rc
deleted file mode 100644
index 62b9bcd..0000000
--- a/gps/brcm/init.gps.rc
+++ /dev/null
@@ -1,31 +0,0 @@
-service lhd /vendor/bin/hw/lhd /vendor/etc/gnss/lhd.conf
- class main
- user gps
- group system inet net_raw sdcard_rw
- ioprio be 0
-
-service gpsd /vendor/bin/hw/gpsd -c /vendor/etc/gnss/gps.xml
- class main
- user gps
- group system gps radio inet wakelock sdcard_rw net_raw
- ioprio be 0
-
-service scd /vendor/bin/hw/scd /vendor/etc/gnss/scd.conf
- class main
- user gps
- group system inet net_raw wakelock
- ioprio be 0
-
-service gnss_service /vendor/bin/hw/android.hardware.gnss@2.1-service-brcm
- class hal
- user gps
- group system gps radio
- ioprio be 0
- priority -1
-
-# disable gps service if no gps h/w
-on property:vendor.ril.cbd.svc=0
- stop gpsd
- stop lhd
- stop scd
-