init gs201 builds

Bug: 183183095
Change-Id: Ida78d0352dbd79acb8f2122b51fdb47a2e217bf0

21 files changed, 99 insertions, 98 deletions

diff --git a/Android.mk b/Android.mk
index e6a9462..367e845 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,6 +25,6 @@ LOCAL_PATH := $(call my-dir)
 # if some modules are built directly from this directory (not subdirectories),
 # their rules should be written here.
 
-ifeq ($(USES_DEVICE_GOOGLE_GS101),true)
+ifeq ($(USES_DEVICE_GOOGLE_GS201),true)
   include $(call first-makefiles-under,$(LOCAL_PATH))
 endif
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index d437f5b..f0576c0 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -24,7 +24,7 @@ TARGET_SOC := gs101
 
 TARGET_SOC_NAME := google
 
-USES_DEVICE_GOOGLE_GS101 := true
+USES_DEVICE_GOOGLE_GS201 := true
 
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
@@ -52,8 +52,8 @@ TARGET_NO_RADIOIMAGE := true
 BOARD_USES_GENERIC_KERNEL_IMAGE := true
 BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
 BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true
-TARGET_RECOVERY_WIPE := device/google/gs101/conf/recovery.wipe
-TARGET_RECOVERY_FSTAB := device/google/gs101/conf/fstab.gs101
+TARGET_RECOVERY_WIPE := device/google/gs201/conf/recovery.wipe
+TARGET_RECOVERY_FSTAB := device/google/gs201/conf/fstab.gs101
 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
 TARGET_RECOVERY_UI_LIB := \
@@ -83,7 +83,7 @@ endif
 BOARD_EMULATOR_COMMON_MODULES := liblight
 
 OVERRIDE_RS_DRIVER := libRSDriverArm.so
-BOARD_EGL_CFG := device/google/gs101/conf/egl.cfg
+BOARD_EGL_CFG := device/google/gs201/conf/egl.cfg
 #BOARD_USES_HGL := true
 USE_OPENGL_RENDERER := true
 NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
@@ -287,7 +287,7 @@ BOARD_USES_METADATA_PARTITION := true
 #BOARD_USES_FIMGAPI_V5X := true
 
 # SECCOMP Policy
-BOARD_SECCOMP_POLICY = device/google/gs101/seccomp_policy
+BOARD_SECCOMP_POLICY = device/google/gs201/seccomp_policy
 
 #CURL
 BOARD_USES_CURL := true
@@ -399,6 +399,7 @@ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
 BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
 
 include device/google/gs101-sepolicy/gs101-sepolicy.mk
+include device/google/gs201-sepolicy/gs201-sepolicy.mk
 
 # Battery options
 BOARD_KERNEL_CMDLINE += at24.write_timeout=100
diff --git a/aosp_common.mk b/aosp_common.mk
index 1ad6eb7..e2d5d43 100644
--- a/aosp_common.mk
+++ b/aosp_common.mk
@@ -45,8 +45,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
 
-#$(call inherit-product, device/google/gs101/device.mk)
-#$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
+#$(call inherit-product, device/google/gs201/device.mk)
+#$(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 
 # TODO: fix
 # PRODUCT_RESTRICT_VENDOR_FILES := all
diff --git a/device-common.mk b/device-common.mk
index ae6470b..44bd8f3 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-include device/google/gs101/device.mk
+include device/google/gs201/device.mk
 
 # Telephony
 PRODUCT_COPY_FILES += \
diff --git a/device-shipping-common.mk b/device-shipping-common.mk
index 2c5decb..2c637bc 100644
--- a/device-shipping-common.mk
+++ b/device-shipping-common.mk
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include device/google/gs101/device-common.mk
+include device/google/gs201/device-common.mk
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.bluetooth.a2dp_offload.supported=true \
@@ -26,5 +26,5 @@ PRODUCT_PACKAGES += \
     android.hardware.secure_element@1.2-service-gto-ese2
 
 PRODUCT_COPY_FILES += \
-    device/google/gs101/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
-    device/google/gs101/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
+    device/google/gs201/nfc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
+    device/google/gs201/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
diff --git a/device.mk b/device.mk
index 866a052..ea150bd 100644
--- a/device.mk
+++ b/device.mk
@@ -36,7 +36,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	hardware/google/graphics/gs101 \
 	hardware/google/interfaces \
 	hardware/google/pixel \
-	device/google/gs101 \
+	device/google/gs201 \
 	vendor/google/whitechapel/tools \
 	vendor/arm/mali/valhall \
 	vendor/arm/mali/valhall/cl \
@@ -152,31 +152,31 @@ endif
 # Device Manifest, Device Compatibility Matrix for Treble
 ifeq ($(DEVICE_USES_EXYNOS_GRALLOC_VERSION), 4)
 	DEVICE_MANIFEST_FILE := \
-		device/google/gs101/manifest$(LOCAL_64ONLY).xml
+		device/google/gs201/manifest$(LOCAL_64ONLY).xml
 else
 	DEVICE_MANIFEST_FILE := \
-		device/google/gs101/manifest$(LOCAL_64ONLY)-gralloc3.xml
+		device/google/gs201/manifest$(LOCAL_64ONLY)-gralloc3.xml
 endif
 
 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 DEVICE_MANIFEST_FILE += \
-	device/google/gs101/manifest_media_aosp.xml
+	device/google/gs201/manifest_media_aosp.xml
 
 PRODUCT_COPY_FILES += \
-	device/google/gs101/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml
+	device/google/gs201/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml
 else
 DEVICE_MANIFEST_FILE += \
-	device/google/gs101/manifest_media.xml
+	device/google/gs201/manifest_media.xml
 
 PRODUCT_COPY_FILES += \
-	device/google/gs101/media_codecs_bo_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
-	device/google/gs101/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_aosp_c2.xml
+	device/google/gs201/media_codecs_bo_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
+	device/google/gs201/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_aosp_c2.xml
 endif
 
 DEVICE_MATRIX_FILE := \
-	device/google/gs101/compatibility_matrix.xml
+	device/google/gs201/compatibility_matrix.xml
 
-DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay
+DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay
 
 # This will be updated to 31 (Android S) for shipping
 PRODUCT_SHIPPING_API_LEVEL := 30
@@ -191,43 +191,43 @@ PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
 # Init files
 PRODUCT_COPY_FILES += \
 	$(LOCAL_KERNEL):kernel \
-	device/google/gs101/conf/init.gs101.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.gs101.usb.rc \
-	device/google/gs101/conf/ueventd.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc
+	device/google/gs201/conf/init.gs101.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.gs101.usb.rc \
+	device/google/gs201/conf/ueventd.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc
 
 PRODUCT_COPY_FILES += \
-	device/google/gs101/conf/init.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.rc
+	device/google/gs201/conf/init.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.rc
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_COPY_FILES += \
-	device/google/gs101/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc
+	device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc
 endif
 
 # If AoC Daemon is not present on this build, load firmware at boot via rc
 ifeq ($(wildcard vendor/google/whitechapel/aoc/aocd),)
 PRODUCT_COPY_FILES += \
-	device/google/gs101/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.aoc.rc
+	device/google/gs201/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.aoc.rc
 else
 PRODUCT_COPY_FILES += \
-	device/google/gs101/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.aoc.rc
+	device/google/gs201/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.aoc.rc
 endif
 
 # Recovery files
 PRODUCT_COPY_FILES += \
-	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs101.rc
+	device/google/gs201/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs101.rc
 
 # Fstab files
 PRODUCT_COPY_FILES += \
-	device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.gs101 \
-	device/google/gs101/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
-	device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.gs101
+	device/google/gs201/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.gs101 \
+	device/google/gs201/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
+	device/google/gs201/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.gs101
 
 # Shell scripts
 PRODUCT_COPY_FILES += \
-	device/google/gs101/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \
+	device/google/gs201/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \
 
 # insmod files
 PRODUCT_COPY_FILES += \
-	device/google/gs101/init.insmod.gs101.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.gs101.cfg
+	device/google/gs201/init.insmod.gs101.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.gs101.cfg
 
 # For creating dtbo image
 PRODUCT_HOST_PACKAGES += \
@@ -289,7 +289,7 @@ PRODUCT_PACKAGES += \
 
 # Touch firmware
 #PRODUCT_COPY_FILES += \
-	device/google/gs101/firmware/touch/s6sy761.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/s6sy761.fw
+	device/google/gs201/firmware/touch/s6sy761.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/s6sy761.fw
 # Touch
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml
@@ -325,7 +325,7 @@ endif
 
 # Power HAL
 PRODUCT_COPY_FILES += \
-	device/google/gs101/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
+	device/google/gs201/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
 # adpf 16ms update rate
 PRODUCT_PRODUCT_PROPERTIES += \
         vendor.powerhal.adpf.rate=16666666
@@ -334,13 +334,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	vendor.powerhal.adpf.uclamp=0
 
 PRODUCT_COPY_FILES += \
-	device/google/gs101/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
+	device/google/gs201/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
 
 PRODUCT_COPY_FILES += \
-	device/google/gs101/powerhint_a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint_a0.json
+	device/google/gs201/powerhint_a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint_a0.json
 
 PRODUCT_COPY_FILES += \
-	device/google/gs101/powerhint_a1.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint_a1.json
+	device/google/gs201/powerhint_a1.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint_a1.json
 -include hardware/google/pixel/power-libperfmgr/aidl/device.mk
 
 # PowerStats HAL
@@ -379,11 +379,11 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000
 
 # Calliope firmware overwrite
 #PRODUCT_COPY_FILES += \
-	device/google/gs101/firmware/calliope_dram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram.bin \
-	device/google/gs101/firmware/calliope_sram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_sram.bin \
-	device/google/gs101/firmware/calliope_dram_2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram_2.bin \
-	device/google/gs101/firmware/calliope_sram_2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_sram_2.bin \
-	device/google/gs101/firmware/calliope2.dt:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope2.dt \
+	device/google/gs201/firmware/calliope_dram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram.bin \
+	device/google/gs201/firmware/calliope_sram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_sram.bin \
+	device/google/gs201/firmware/calliope_dram_2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram_2.bin \
+	device/google/gs201/firmware/calliope_sram_2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_sram_2.bin \
+	device/google/gs201/firmware/calliope2.dt:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope2.dt \
 
 # Cannot reference variables defined in BoardConfig.mk, uncomment this if
 # BOARD_USE_OFFLOAD_AUDIO and BOARD_USE_OFFLOAD_EFFECT are true
@@ -514,10 +514,10 @@ PRODUCT_PACKAGES_DEBUG += \
 
 # Copy Camera HFD Setfiles
 #PRODUCT_COPY_FILES += \
-	device/google/gs101/firmware/camera/libhfd/default_configuration.hfd.cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/default_configuration.hfd.cfg.json \
-	device/google/gs101/firmware/camera/libhfd/pp_cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/pp_cfg.json \
-	device/google/gs101/firmware/camera/libhfd/tracker_cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/tracker_cfg.json \
-	device/google/gs101/firmware/camera/libhfd/WithLightFixNoBN.SDNNmodel:$(TARGET_COPY_OUT_VENDOR)/firmware/WithLightFixNoBN.SDNNmodel
+	device/google/gs201/firmware/camera/libhfd/default_configuration.hfd.cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/default_configuration.hfd.cfg.json \
+	device/google/gs201/firmware/camera/libhfd/pp_cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/pp_cfg.json \
+	device/google/gs201/firmware/camera/libhfd/tracker_cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/tracker_cfg.json \
+	device/google/gs201/firmware/camera/libhfd/WithLightFixNoBN.SDNNmodel:$(TARGET_COPY_OUT_VENDOR)/firmware/WithLightFixNoBN.SDNNmodel
 
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
@@ -604,7 +604,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	persist.sys.sf.native_mode=2 \
 	persist.sys.sf.color_mode=9
 PRODUCT_COPY_FILES += \
-	device/google/gs101/display/display_colordata_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal0.pb
+	device/google/gs201/display/display_colordata_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal0.pb
 
 PRODUCT_PROPERTY_OVERRIDES += debug.renderengine.backend=skiaglthreaded
 
@@ -627,12 +627,12 @@ PRODUCT_CHARACTERISTICS := nosdcard
 
 # WPA SUPPLICANT
 PRODUCT_COPY_FILES += \
-	device/google/gs101/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \
-	device/google/gs101/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
+	device/google/gs201/wifi/p2p_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant.conf \
+	device/google/gs201/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
 
 # WIFI COEX
 PRODUCT_COPY_FILES += \
-	device/google/gs101/wifi/coex_table.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/coex_table.xml
+	device/google/gs201/wifi/coex_table.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/coex_table.xml
 
 PRODUCT_PACKAGES += hostapd
 PRODUCT_PACKAGES += wpa_supplicant
@@ -655,14 +655,14 @@ SOONG_CONFIG_bigo_soc := gs101
 
 # MFC firmware
 PRODUCT_COPY_FILES += \
-	device/google/gs101/firmware/mfc_fw_v14.2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/mfc_fw.bin
+	device/google/gs201/firmware/mfc_fw_v14.2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/mfc_fw.bin
 
 # 1. Codec 2.0
 # exynos service
 PRODUCT_SOONG_NAMESPACES += vendor/samsung_slsi/codec2
 
 PRODUCT_COPY_FILES += \
-	device/google/gs101/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
+	device/google/gs201/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
 
 PRODUCT_PACKAGES += \
 	samsung.hardware.media.c2@1.0-service \
@@ -689,8 +689,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # 2. OpenMAX IL
 PRODUCT_COPY_FILES += \
-	device/google/gs101/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
-	device/google/gs101/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml
+	device/google/gs201/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
+	device/google/gs201/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml
 ####################################
 
 # Telephony
@@ -719,14 +719,14 @@ GPS_CHIPSET := 47765
 
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
-	device/google/gs101/gnss/${GPS_CHIPSET}/config/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-	device/google/gs101/gnss/${GPS_CHIPSET}/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-	device/google/gs101/gnss/${GPS_CHIPSET}/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
-	device/google/gs101/gnss/${GPS_CHIPSET}/config/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \
-	device/google/gs101/gnss/${GPS_CHIPSET}/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch
+	device/google/gs201/gnss/${GPS_CHIPSET}/config/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
+	device/google/gs201/gnss/${GPS_CHIPSET}/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+	device/google/gs201/gnss/${GPS_CHIPSET}/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
+	device/google/gs201/gnss/${GPS_CHIPSET}/config/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \
+	device/google/gs201/gnss/${GPS_CHIPSET}/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch
 
 PRODUCT_SOONG_NAMESPACES += \
-	device/google/gs101/gnss/$(GPS_CHIPSET)
+	device/google/gs201/gnss/$(GPS_CHIPSET)
 
 PRODUCT_PACKAGES += \
 	android.hardware.gnss@2.1-impl-google \
@@ -814,7 +814,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	ro.postinstall.fstab.prefix=/product
 
 PRODUCT_COPY_FILES += \
-	device/google/gs101/conf/fstab.postinstall:$(TARGET_COPY_OUT_PRODUCT)/etc/fstab.postinstall
+	device/google/gs201/conf/fstab.postinstall:$(TARGET_COPY_OUT_PRODUCT)/etc/fstab.postinstall
 
 # fastbootd
 PRODUCT_PACKAGES += \
@@ -898,7 +898,7 @@ SUPPORT_NR := true
 USE_RADIO_HAL_1_6 := true
 
 #$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
-#$(call inherit-product, vendor/google_devices/gs101/proprietary/device-vendor.mk)
+#$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk)
 
 ifneq ($(BOARD_WITHOUT_RADIO),true)
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/common/device-vendor.mk)
@@ -918,8 +918,8 @@ $(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/buil
 $(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk)
 
 PRODUCT_COPY_FILES += \
-	device/google/gs101/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
-	device/google/gs101/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
+	device/google/gs201/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
+	device/google/gs201/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
 	frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
 
 # modem_svc_sit daemon
@@ -929,7 +929,7 @@ PRODUCT_PACKAGES += modem_svc_sit
 PRODUCT_PACKAGES += modem_logging_control
 
 PRODUCT_COPY_FILES += \
-	device/google/gs101/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv
+	device/google/gs201/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv
 
 # ARM NN files
 ARM_COMPUTE_CL_ENABLE := 1
@@ -1156,4 +1156,4 @@ PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
 # Install product specific framework compatibility matrix
 # (TODO: b/169535506) This includes the FCM for system_ext and product partition.
 # It must be split into the FCM of each partition.
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs101/device_framework_matrix_product.xml
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs201/device_framework_matrix_product.xml
diff --git a/factory/framework/Android.bp b/factory/framework/Android.bp
index 54b5b68..29e6eb3 100644
--- a/factory/framework/Android.bp
+++ b/factory/framework/Android.bp
@@ -1,11 +1,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/factory/launcher3/Android.bp b/factory/launcher3/Android.bp
index 31ee56a..27c8e1a 100644
--- a/factory/launcher3/Android.bp
+++ b/factory/launcher3/Android.bp
@@ -1,11 +1,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/factory/settings/Android.bp b/factory/settings/Android.bp
index adc3ea4..2a1efc0 100644
--- a/factory/settings/Android.bp
+++ b/factory/settings/Android.bp
@@ -1,11 +1,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/factory_common.mk b/factory_common.mk
index b4f1a1e..2071163 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-$(call inherit-product, device/google/gs101/aosp_common.mk)
-$(call inherit-product-if-exists, vendor/google_devices/gs101/factory/pixel/device-factory.mk)
+$(call inherit-product, device/google/gs201/aosp_common.mk)
+$(call inherit-product-if-exists, vendor/google_devices/gs201/factory/pixel/device-factory.mk)
 
 PRODUCT_PROPERTY_OVERRIDES += service.adb.root=1 \
                               ro.vendor.factory=1
@@ -54,10 +54,10 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive
 BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 
 # Disable Bluetooth as default in factory build
-DEVICE_PACKAGE_OVERLAYS += device/google/gs101/overlay-factory
+DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory
 
 PRODUCT_COPY_FILES += \
-    device/google/gs101/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc
+    device/google/gs201/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc
 
 # Add factory-friendly changes
 PRODUCT_PACKAGES += \
diff --git a/fingerprint/fpc1540/fpc1540.mk b/fingerprint/fpc1540/fpc1540.mk
index 7fdcb12..779af80 100644
--- a/fingerprint/fpc1540/fpc1540.mk
+++ b/fingerprint/fpc1540/fpc1540.mk
@@ -1,5 +1,5 @@
 # Fingerprint
-include device/google/gs101/fingerprint/fpc1540/fingerprint_config.mk
+include device/google/gs201/fingerprint/fpc1540/fingerprint_config.mk
 
 PRODUCT_PACKAGES += \
     android.hardware.biometrics.fingerprint@2.1-service.fpc \
diff --git a/fingerprint/fpc1540/fpc1540_factory.mk b/fingerprint/fpc1540/fpc1540_factory.mk
index e868c5e..968e1d3 100644
--- a/fingerprint/fpc1540/fpc1540_factory.mk
+++ b/fingerprint/fpc1540/fpc1540_factory.mk
@@ -1,5 +1,5 @@
 # Fingerprint
-include device/google/gs101/fingerprint/fpc1540/fingerprint_config_factory.mk
+include device/google/gs201/fingerprint/fpc1540/fingerprint_config_factory.mk
 
 PRODUCT_PACKAGES += \
     fpc_tee_test\
diff --git a/gnss/47765/Android.bp b/gnss/47765/Android.bp
index f4a2902..5aca3c7 100644
--- a/gnss/47765/Android.bp
+++ b/gnss/47765/Android.bp
@@ -18,11 +18,11 @@ soong_namespace {
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/health/Android.bp b/health/Android.bp
index 41a0e12..8cb67d7 100644
--- a/health/Android.bp
+++ b/health/Android.bp
@@ -17,11 +17,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/interfaces/boot/1.0/Android.bp b/interfaces/boot/1.0/Android.bp
index 179a6f9..0c2c212 100644
--- a/interfaces/boot/1.0/Android.bp
+++ b/interfaces/boot/1.0/Android.bp
@@ -16,11 +16,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/interfaces/boot/1.2/Android.bp b/interfaces/boot/1.2/Android.bp
index 982a543..f04635f 100644
--- a/interfaces/boot/1.2/Android.bp
+++ b/interfaces/boot/1.2/Android.bp
@@ -16,11 +16,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/keymaster/Android.bp b/keymaster/Android.bp
index 99aa4b4..d233656 100644
--- a/keymaster/Android.bp
+++ b/keymaster/Android.bp
@@ -16,11 +16,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/pixelstats/Android.bp b/pixelstats/Android.bp
index 45768d1..5d594d1 100644
--- a/pixelstats/Android.bp
+++ b/pixelstats/Android.bp
@@ -16,11 +16,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/powerstats/Android.bp b/powerstats/Android.bp
index 10ecbed..82b864e 100644
--- a/powerstats/Android.bp
+++ b/powerstats/Android.bp
@@ -14,11 +14,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/rro_overlays/WifiOverlay/Android.bp b/rro_overlays/WifiOverlay/Android.bp
index 64259d2..63e4094 100644
--- a/rro_overlays/WifiOverlay/Android.bp
+++ b/rro_overlays/WifiOverlay/Android.bp
@@ -1,11 +1,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }
 
diff --git a/usb/Android.bp b/usb/Android.bp
index ccaa001..9e37c7f 100644
--- a/usb/Android.bp
+++ b/usb/Android.bp
@@ -16,11 +16,11 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "//device/google/gs101:device_google_gs101_license"
+    // all of the 'license_kinds' from "//device/google/gs201:device_google_gs101_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-Apache-2.0
     default_applicable_licenses: [
-        "//device/google/gs101:device_google_gs101_license",
+        "//device/google/gs201:device_google_gs101_license",
     ],
 }