refactor and merge gps build system

Bug: 290725902
Test: verification test at b/290725902
Change-Id: I3206e8e1137f4d436aa10c976215dbc6eb7171da
diff --git a/gps/brcm/device.mk b/gps/brcm/device.mk
index 73d0492..dd64dd3 100644
--- a/gps/brcm/device.mk
+++ b/gps/brcm/device.mk
@@ -1,13 +1,14 @@
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/brcm/sepolicy
 
-PRODUCT_SOONG_NAMESPACES += device/google/gs-common/gps/brcm/prebuilt
+PRODUCT_SOONG_NAMESPACES += vendor/broadcom/gps/bcm47765
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-  $(call soong_config_set, SensorHub_debug, assertion, true)
-endif
+$(call soong_config_set, gpssdk, sdkv1, False)
+
+$(call soong_config_set, gpssdk, gpsmcuversion, gpsv2_$(TARGET_BUILD_VARIANT))
 
 PRODUCT_PACKAGES += \
 	bcm47765_gps_package \
+	sitril-gps \
 	android.hardware.location.gps.prebuilt.xml
 
 PRODUCT_PACKAGES_DEBUG += \