gps: separate into system and vendor components

Change-Id: I489a2cf50b4dcc143c26c474d3dee0b792e09ea1

components.mk

@@ -62,6 +62,7 @@ endif
 
 ifneq (,$(filter gps, $(TARGET_COMMON_QTI_COMPONENTS)))
 include $(QCOM_COMMON_PATH)/system/gps/qti-gps.mk
+include $(QCOM_COMMON_PATH)/vendor/gps/qti-gps.mk
 endif
 
 ifneq (,$(filter init, $(TARGET_COMMON_QTI_COMPONENTS)))

system/gps/qti-gps.mk

@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Paranoid Android
+# Copyright (C) 2022 Paranoid Android
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,22 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PRODUCT_SOONG_NAMESPACES += \
-    device/qcom/common/system/gps
-
-# Flags
-BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
-
-# Inherit the GPS HAL.
-$(call inherit-product-if-exists, hardware/qcom/gps/gps_vendor_product.mk)
-
-# Overlays
-PRODUCT_PACKAGES += \
-    QCOMGPSFrameworksOverlay
-
-# Permissions
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml
-
 # Get non-open-source specific aspects.
 $(call inherit-product-if-exists, vendor/qcom/common/system/gps/gps-vendor.mk)

vendor/gps/qti-gps.mk

@@ -0,0 +1,33 @@
+# Copyright (C) 2022 Paranoid Android
+#
+# 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.
+
+PRODUCT_SOONG_NAMESPACES += \
+    device/qcom/common/vendor/gps
+
+# Flags
+BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default
+
+# Inherit the GPS HAL.
+$(call inherit-product-if-exists, hardware/qcom/gps/gps_vendor_product.mk)
+
+# Overlays
+PRODUCT_PACKAGES += \
+    QCOMGPSFrameworksOverlay
+
+# Permissions
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml
+
+# Get non-open-source specific aspects.
+$(call inherit-product-if-exists, vendor/qcom/common/vendor/gps/gps-vendor.mk)