From 66befd88e3c544cf6a896ed24b060114340bbc78 Mon Sep 17 00:00:00 2001 From: Aaron Ding Date: Fri, 15 Apr 2022 18:52:04 +0800 Subject: [PATCH] Create device Ripcurrent on Zuma platform s/cloudripper/ripcurrent s/gs201/zuma s/pantah/ripcurrent Bug: 229340586 Change-Id: Ic5dffbbfadbb1eb8479587b95222801426bba35e Signed-off-by: Aaron Ding --- Android.bp | 4 +- Android.mk | 2 +- BoardConfig-common.mk | 16 +-- CleanSpec.mk | 6 +- aoc/device.mk | 6 +- aosp_common.mk | 4 +- conf/Android.bp | 24 ++-- conf/{fstab.gs201.in => fstab.zuma.in} | 0 conf/{init.gs201.rc => init.zuma.rc} | 4 +- conf/{init.gs201.usb.rc => init.zuma.usb.rc} | 0 conf/{ueventd.gs201.rc => ueventd.zuma.rc} | 0 device-common.mk | 6 +- device-shipping-common.mk | 2 +- device.mk | 134 +++++++++--------- dumpstate/Android.mk | 4 +- ...id.hardware.dumpstate@1.1-service.zuma.rc} | 2 +- dumpstate/service.cpp | 2 +- edgetpu/edgetpu.mk | 2 +- factory/framework/Android.bp | 4 +- factory/launcher3/Android.bp | 4 +- factory/settings/Android.bp | 4 +- factory_common.mk | 8 +- fingerprint/fpc1540/fpc1540.mk | 2 +- fingerprint/fpc1540/fpc1540_factory.mk | 2 +- gnss/47765/Android.bp | 4 +- gnss/device-gnss.mk | 14 +- health/Android.bp | 20 +-- health/Health.cpp | 2 +- ...> android.hardware.health-service.zuma.rc} | 4 +- ... android.hardware.health-service.zuma.xml} | 0 ....hardware.health-service.zuma_recovery.rc} | 2 +- init.insmod.gs201.cfg => init.insmod.zuma.cfg | 0 interfaces/boot/1.0/Android.bp | 10 +- ...android.hardware.boot@1.0-service-zuma.rc} | 2 +- interfaces/boot/1.2/Android.bp | 12 +- ...android.hardware.boot@1.2-service-zuma.rc} | 2 +- keymaster/Android.bp | 4 +- pixelstats/Android.bp | 6 +- ...dor.gs201.rc => pixelstats-vendor.zuma.rc} | 0 powerstats/Android.bp | 6 +- ...viders.cpp => ZumaCommonDataProviders.cpp} | 4 +- ...aProviders.h => ZumaCommonDataProviders.h} | 2 +- .../EuiccSupportPixelOverlay/Android.bp | 4 +- .../AndroidManifest.xml | 2 +- sensors/Android.mk | 2 +- usb/gadget/Android.bp | 4 +- usb/gadget/UsbGadget.cpp | 2 +- usb/usb/Android.bp | 4 +- widevine/device.mk | 2 +- wifi/qcom/BoardConfig-wifi.mk | 2 +- 50 files changed, 179 insertions(+), 179 deletions(-) rename conf/{fstab.gs201.in => fstab.zuma.in} (100%) rename conf/{init.gs201.rc => init.zuma.rc} (99%) rename conf/{init.gs201.usb.rc => init.zuma.usb.rc} (100%) rename conf/{ueventd.gs201.rc => ueventd.zuma.rc} (100%) rename dumpstate/{android.hardware.dumpstate@1.1-service.gs201.rc => android.hardware.dumpstate@1.1-service.zuma.rc} (91%) rename health/{android.hardware.health-service.gs201.rc => android.hardware.health-service.zuma.rc} (80%) rename health/{android.hardware.health-service.gs201.xml => android.hardware.health-service.zuma.xml} (100%) rename health/{android.hardware.health-service.gs201_recovery.rc => android.hardware.health-service.zuma_recovery.rc} (62%) rename init.insmod.gs201.cfg => init.insmod.zuma.cfg (100%) rename interfaces/boot/1.0/{android.hardware.boot@1.0-service-gs201.rc => android.hardware.boot@1.0-service-zuma.rc} (85%) rename interfaces/boot/1.2/{android.hardware.boot@1.2-service-gs201.rc => android.hardware.boot@1.2-service-zuma.rc} (94%) rename pixelstats/{pixelstats-vendor.gs201.rc => pixelstats-vendor.zuma.rc} (100%) rename powerstats/{Gs201CommonDataProviders.cpp => ZumaCommonDataProviders.cpp} (99%) rename powerstats/include/{Gs201CommonDataProviders.h => ZumaCommonDataProviders.h} (92%) diff --git a/Android.bp b/Android.bp index 9b83b174..ef1e4b44 100644 --- a/Android.bp +++ b/Android.bp @@ -6,7 +6,7 @@ soong_namespace { } package { - default_applicable_licenses: ["device_google_gs201_license"], + default_applicable_licenses: ["device_google_zuma_license"], } // Added automatically by a large-scale-change that took the approach of @@ -24,7 +24,7 @@ package { // used in the current project. // See: http://go/android-license-faq license { - name: "device_google_gs201_license", + name: "device_google_zuma_license", visibility: [":__subpackages__"], license_kinds: [ "SPDX-license-identifier-Apache-2.0", diff --git a/Android.mk b/Android.mk index 367e845a..370f6f37 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_GS201),true) +ifeq ($(USES_DEVICE_GOOGLE_ZUMA),true) include $(call first-makefiles-under,$(LOCAL_PATH)) endif diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 93f3f0aa..bee25093 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -20,11 +20,11 @@ include build/make/target/board/BoardConfigPixelCommon.mk PRODUCT_FULL_TREBLE_OVERRIDE := true # HACK : To fix up after bring up multimedia devices. -TARGET_SOC := gs201 +TARGET_SOC := zuma TARGET_SOC_NAME := google -USES_DEVICE_GOOGLE_GS201 := true +USES_DEVICE_GOOGLE_ZUMA := true TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-2a @@ -56,12 +56,12 @@ endif 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/gs201/conf/recovery.wipe +TARGET_RECOVERY_WIPE := device/google/zuma/conf/recovery.wipe # This is the fstab file that will be included in the recovery image. Note that # recovery doesn't care about the encryption settings, so it doesn't matter # whether we use the normal or the fips fstab here. -TARGET_RECOVERY_FSTAB_GENRULE := gen_fstab.gs201 +TARGET_RECOVERY_FSTAB_GENRULE := gen_fstab.zuma TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165 @@ -99,7 +99,7 @@ endif BOARD_EMULATOR_COMMON_MODULES := liblight OVERRIDE_RS_DRIVER := libRSDriverArm.so -BOARD_EGL_CFG := device/google/gs201/conf/egl.cfg +BOARD_EGL_CFG := device/google/zuma/conf/egl.cfg #BOARD_USES_HGL := true USE_OPENGL_RENDERER := true NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 @@ -254,7 +254,7 @@ HWC_SUPPORT_COLOR_TRANSFORM := true BOARD_USES_EXYNOS_AFBC_FEATURE := true #BOARD_USES_HDRUI_GLES_CONVERSION := true -BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_gs201 +BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_zuma BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin # HWCServices @@ -303,7 +303,7 @@ BOARD_USES_METADATA_PARTITION := true #BOARD_USES_FIMGAPI_V5X := true # SECCOMP Policy -BOARD_SECCOMP_POLICY = device/google/gs201/seccomp_policy +BOARD_SECCOMP_POLICY = device/google/zuma/seccomp_policy #CURL BOARD_USES_CURL := true @@ -396,7 +396,7 @@ BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES) # Using BUILD_COPY_HEADERS BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true -include device/google/gs201-sepolicy/gs201-sepolicy.mk +include device/google/zuma-sepolicy/zuma-sepolicy.mk # Battery options BOARD_KERNEL_CMDLINE += at24.write_timeout=100 diff --git a/CleanSpec.mk b/CleanSpec.mk index 34323de4..4a5e09d3 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -74,9 +74,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.us $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb@1.3-service.slider.xml) # Power Stats HAL 1.0 to AIDL -$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.power.stats@1.0-service.gs201) -$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/init/android.hardware.power.stats@1.0-service.gs201.rc) -$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.power.stats@1.0-service.gs201.xml) +$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.power.stats@1.0-service.zuma) +$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/init/android.hardware.power.stats@1.0-service.zuma.rc) +$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.power.stats@1.0-service.zuma.xml) # Health HAL to AIDL $(call add-clean-step, find $(PRODUCT_OUT)/system -type f -name "*charger*" -print0 | xargs -0 rm -f) diff --git a/aoc/device.mk b/aoc/device.mk index 3c04b09f..4ee8b4c6 100644 --- a/aoc/device.mk +++ b/aoc/device.mk @@ -1,7 +1,7 @@ PRODUCT_PACKAGES += \ aocd -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/aoc +BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/aoc ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) # IAudioMetricExt HIDL @@ -12,10 +12,10 @@ 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/gs201/aoc/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc + device/google/zuma/aoc/conf/init.aoc.nodaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc else PRODUCT_COPY_FILES += \ - device/google/gs201/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc + device/google/zuma/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc endif # AoC debug support diff --git a/aosp_common.mk b/aosp_common.mk index 30d037c5..e8ed927a 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -41,8 +41,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/gs201/device.mk) -#$(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk) +#$(call inherit-product, device/google/zuma/device.mk) +#$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) # TODO: fix # PRODUCT_RESTRICT_VENDOR_FILES := all diff --git a/conf/Android.bp b/conf/Android.bp index 7f1541f6..31e99abb 100644 --- a/conf/Android.bp +++ b/conf/Android.bp @@ -27,38 +27,38 @@ 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_gs201_license" + // all of the 'license_kinds' from "device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["device_google_gs201_license"], + default_applicable_licenses: ["device_google_zuma_license"], } genrule { - name: "gen_fstab.gs201", - srcs: ["fstab.gs201.in"], - out: ["fstab.gs201"], + name: "gen_fstab.zuma", + srcs: ["fstab.zuma.in"], + out: ["fstab.zuma"], cmd: "sed -e s/@fileencryption@/::inlinecrypt_optimized+wrappedkey_v0/" + " -e s/@metadata_encryption@/:wrappedkey_v0/ $(in) > $(out)", } genrule { - name: "gen_fstab.gs201-fips", - srcs: ["fstab.gs201.in"], - out: ["fstab.gs201-fips"], + name: "gen_fstab.zuma-fips", + srcs: ["fstab.zuma.in"], + out: ["fstab.zuma-fips"], cmd: "sed -e s/@fileencryption@/aes-256-xts/" + " -e s/@metadata_encryption@/aes-256-xts/ $(in) > $(out)", } prebuilt_etc { - name: "fstab.gs201", - src: ":gen_fstab.gs201", + name: "fstab.zuma", + src: ":gen_fstab.zuma", vendor: true, vendor_ramdisk_available: true, } prebuilt_etc { - name: "fstab.gs201-fips", - src: ":gen_fstab.gs201-fips", + name: "fstab.zuma-fips", + src: ":gen_fstab.zuma-fips", vendor: true, vendor_ramdisk_available: true, } diff --git a/conf/fstab.gs201.in b/conf/fstab.zuma.in similarity index 100% rename from conf/fstab.gs201.in rename to conf/fstab.zuma.in diff --git a/conf/init.gs201.rc b/conf/init.zuma.rc similarity index 99% rename from conf/init.gs201.rc rename to conf/init.zuma.rc index bee31cf3..e3d1878a 100644 --- a/conf/init.gs201.rc +++ b/conf/init.zuma.rc @@ -1,4 +1,4 @@ -import /vendor/etc/init/hw/init.gs201.usb.rc +import /vendor/etc/init/hw/init.zuma.usb.rc import android.hardware.drm@1.2-service.widevine.rc import init.exynos.sensorhub.rc @@ -845,7 +845,7 @@ on property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte setprop persist.vendor.charge.start.level 0 setprop vendor.battery.defender.disable 1 -service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.gs201.cfg +service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.zuma.cfg class main user root group root system diff --git a/conf/init.gs201.usb.rc b/conf/init.zuma.usb.rc similarity index 100% rename from conf/init.gs201.usb.rc rename to conf/init.zuma.usb.rc diff --git a/conf/ueventd.gs201.rc b/conf/ueventd.zuma.rc similarity index 100% rename from conf/ueventd.gs201.rc rename to conf/ueventd.zuma.rc diff --git a/device-common.mk b/device-common.mk index 35f04042..925d30d2 100644 --- a/device-common.mk +++ b/device-common.mk @@ -14,8 +14,8 @@ # limitations under the License. # --include vendor/google_devices/gs201/proprietary/telephony/device-vendor.mk -include device/google/gs201/device.mk +-include vendor/google_devices/zuma/proprietary/telephony/device-vendor.mk +include device/google/zuma/device.mk # Telephony PRODUCT_COPY_FILES += \ @@ -30,7 +30,7 @@ PRODUCT_COPY_FILES += \ # Set system properties identifying the chipset PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google -PRODUCT_VENDOR_PROPERTIES += ro.soc.model=GS201 +PRODUCT_VENDOR_PROPERTIES += ro.soc.model=ZUMA PRODUCT_PRODUCT_PROPERTIES += \ persist.vendor.testing_battery_profile=2 diff --git a/device-shipping-common.mk b/device-shipping-common.mk index 63cfb734..20bc4e82 100644 --- a/device-shipping-common.mk +++ b/device-shipping-common.mk @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -include device/google/gs201/device-common.mk +include device/google/zuma/device-common.mk diff --git a/device.mk b/device.mk index 2f9147d7..2276e056 100644 --- a/device.mk +++ b/device.mk @@ -16,7 +16,7 @@ include device/google/gs-common/device.mk -TARGET_BOARD_PLATFORM := gs201 +TARGET_BOARD_PLATFORM := zuma AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_system=true \ @@ -42,11 +42,11 @@ PRODUCT_SOONG_NAMESPACES += \ hardware/google/av \ hardware/google/gchips \ hardware/google/graphics/common \ - hardware/google/graphics/gs201 \ + hardware/google/graphics/zuma \ hardware/google/interfaces \ hardware/google/pixel \ - device/google/gs201 \ - device/google/gs201/powerstats \ + device/google/zuma \ + device/google/zuma/powerstats \ vendor/google/whitechapel/tools \ vendor/google/interfaces \ vendor/google_devices/common/proprietary/confirmatioui_hal \ @@ -80,7 +80,7 @@ PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-xcap=DEBUG PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-HC=DEBUG # Modem userdebug -include device/google/gs201/modem/userdebug.mk +include device/google/zuma/modem/userdebug.mk endif ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) @@ -225,27 +225,27 @@ PRODUCT_VENDOR_PROPERTIES += \ # Device Manifest, Device Compatibility Matrix for Treble DEVICE_MANIFEST_FILE := \ - device/google/gs201/manifest.xml + device/google/zuma/manifest.xml ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) DEVICE_MANIFEST_FILE += \ - device/google/gs201/manifest_media_aosp.xml + device/google/zuma/manifest_media_aosp.xml PRODUCT_COPY_FILES += \ - device/google/gs201/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml + device/google/zuma/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml else DEVICE_MANIFEST_FILE += \ - device/google/gs201/manifest_media.xml + device/google/zuma/manifest_media.xml PRODUCT_COPY_FILES += \ - 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 + device/google/zuma/media_codecs_bo_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ + device/google/zuma/media_codecs_aosp_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_aosp_c2.xml endif DEVICE_MATRIX_FILE := \ - device/google/gs201/compatibility_matrix.xml + device/google/zuma/compatibility_matrix.xml -DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay +DEVICE_PACKAGE_OVERLAYS += device/google/zuma/overlay # This will be updated to 33 (Android T) for shipping PRODUCT_SHIPPING_API_LEVEL := 32 @@ -260,27 +260,27 @@ PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true # Init files PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel \ - device/google/gs201/conf/init.gs201.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.usb.rc \ - device/google/gs201/conf/ueventd.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc + device/google/zuma/conf/init.zuma.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.usb.rc \ + device/google/zuma/conf/ueventd.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc PRODUCT_COPY_FILES += \ - device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc + device/google/zuma/conf/init.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.rc ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc + device/google/zuma/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc endif # Recovery files PRODUCT_COPY_FILES += \ - device/google/gs201/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs201.rc + device/google/zuma/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.zuma.rc # Fstab files PRODUCT_PACKAGES += \ - fstab.gs201 \ - fstab.gs201.vendor_ramdisk \ - fstab.gs201-fips \ - fstab.gs201-fips.vendor_ramdisk + fstab.zuma \ + fstab.zuma.vendor_ramdisk \ + fstab.zuma-fips \ + fstab.zuma-fips.vendor_ramdisk PRODUCT_COPY_FILES += \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ @@ -288,11 +288,11 @@ PRODUCT_COPY_FILES += \ # Shell scripts PRODUCT_COPY_FILES += \ - device/google/gs201/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \ + device/google/zuma/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \ # insmod files PRODUCT_COPY_FILES += \ - device/google/gs201/init.insmod.gs201.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.gs201.cfg + device/google/zuma/init.insmod.zuma.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.zuma.cfg # For creating dtbo image PRODUCT_HOST_PACKAGES += \ @@ -368,7 +368,7 @@ PRODUCT_PACKAGES += \ # Touch firmware #PRODUCT_COPY_FILES += \ - device/google/gs201/firmware/touch/s6sy761.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/s6sy761.fw + device/google/zuma/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 @@ -409,7 +409,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ vendor.powerhal.adpf.rate=16666666 PRODUCT_COPY_FILES += \ - device/google/gs201/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json + device/google/zuma/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json -include hardware/google/pixel/power-libperfmgr/aidl/device.mk @@ -422,10 +422,10 @@ PRODUCT_PACKAGES += \ # dumpstate HAL PRODUCT_PACKAGES += \ - android.hardware.dumpstate@1.1-service.gs201 + android.hardware.dumpstate@1.1-service.zuma # AoC support -include device/google/gs201/aoc/device.mk +include device/google/zuma/aoc/device.mk # # Audio HALs @@ -442,11 +442,11 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000 # Calliope firmware overwrite #PRODUCT_COPY_FILES += \ - 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 \ + device/google/zuma/firmware/calliope_dram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram.bin \ + device/google/zuma/firmware/calliope_sram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_sram.bin \ + device/google/zuma/firmware/calliope_dram_2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram_2.bin \ + device/google/zuma/firmware/calliope_sram_2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_sram_2.bin \ + device/google/zuma/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 @@ -485,31 +485,31 @@ PRODUCT_PACKAGES += \ VideoEditorGoogle # WideVine modules -include device/google/gs201/widevine/device.mk +include device/google/zuma/widevine/device.mk PRODUCT_PACKAGES += \ liboemcrypto \ PANTHER_PRODUCT := %panther CHEETAH_PRODUCT := %cheetah -CLOUDRIPPER_PRODUCT := %cloudripper +RIPCURRENT_PRODUCT := %ripcurrent ifneq (,$(filter $(PANTHER_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := panther else ifneq (,$(filter $(CHEETAH_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := cheetah -else ifneq (,$(filter $(CLOUDRIPPER_PRODUCT), $(TARGET_PRODUCT))) - LOCAL_TARGET_PRODUCT := cloudripper +else ifneq (,$(filter $(RIPCURRENT_PRODUCT), $(TARGET_PRODUCT))) + LOCAL_TARGET_PRODUCT := ripcurrent else - # WAR: continue defaulting to slider build on gs201 to not + # WAR: continue defaulting to slider build on zuma to not # break dev targets such as ravenclaw LOCAL_TARGET_PRODUCT := slider endif -$(call soong_config_set,google3a_config,soc,gs201) +$(call soong_config_set,google3a_config,soc,zuma) $(call soong_config_set,google3a_config,gcam_awb,true) $(call soong_config_set,google3a_config,ghawb_truetone,true) ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),) -$(call soong_config_set,lyric,soc,gs201) +$(call soong_config_set,lyric,soc,zuma) $(call soong_config_set,lyric,use_lyric_camera_hal,true) # lyric::tuning_product is set in device-specific makefiles, # such as device/google/${DEVICE}/device-${DEVICE}.mk @@ -561,10 +561,10 @@ PRODUCT_PACKAGES_DEBUG += \ # Copy Camera HFD Setfiles #PRODUCT_COPY_FILES += \ - 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 + device/google/zuma/firmware/camera/libhfd/default_configuration.hfd.cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/default_configuration.hfd.cfg.json \ + device/google/zuma/firmware/camera/libhfd/pp_cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/pp_cfg.json \ + device/google/zuma/firmware/camera/libhfd/tracker_cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/tracker_cfg.json \ + device/google/zuma/firmware/camera/libhfd/WithLightFixNoBN.SDNNmodel:$(TARGET_COPY_OUT_VENDOR)/firmware/WithLightFixNoBN.SDNNmodel # WiFi PRODUCT_COPY_FILES += \ @@ -646,7 +646,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.sys.sf.native_mode=2 \ persist.sys.sf.color_mode=9 PRODUCT_COPY_FILES += \ - device/google/gs201/display/display_colordata_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal0.pb + device/google/zuma/display/display_colordata_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal0.pb # limit DPP downscale ratio PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.hwc.dpp.downscale=2 @@ -667,7 +667,7 @@ PRODUCT_CHARACTERISTICS := nosdcard # WIFI COEX PRODUCT_COPY_FILES += \ - device/google/gs201/wifi/coex_table.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/coex_table.xml + device/google/zuma/wifi/coex_table.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/coex_table.xml PRODUCT_PACKAGES += hostapd PRODUCT_PACKAGES += wpa_supplicant @@ -684,14 +684,14 @@ endif ## VIDEO #################################### -$(call soong_config_set,bigo,soc,gs201) +$(call soong_config_set,bigo,soc,zuma) # 1. Codec 2.0 # exynos service PRODUCT_SOONG_NAMESPACES += vendor/samsung_slsi/codec2 PRODUCT_COPY_FILES += \ - device/google/gs201/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \ + device/google/zuma/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \ PRODUCT_PACKAGES += \ samsung.hardware.media.c2@1.0-service \ @@ -723,8 +723,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ # 2. OpenMAX IL PRODUCT_COPY_FILES += \ - 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 + device/google/zuma/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ + device/google/zuma/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml #################################### # Telephony @@ -813,7 +813,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.postinstall.fstab.prefix=/product PRODUCT_COPY_FILES += \ - device/google/gs201/conf/fstab.postinstall:$(TARGET_COPY_OUT_PRODUCT)/etc/fstab.postinstall + device/google/zuma/conf/fstab.postinstall:$(TARGET_COPY_OUT_PRODUCT)/etc/fstab.postinstall # fastbootd PRODUCT_PACKAGES += \ @@ -855,8 +855,8 @@ PRODUCT_PACKAGES += ShannonRcs # Boot Control HAL PRODUCT_PACKAGES += \ - android.hardware.boot@1.2-impl-gs201 \ - android.hardware.boot@1.2-service-gs201 + android.hardware.boot@1.2-impl-zuma \ + android.hardware.boot@1.2-service-zuma # Exynos RIL and telephony # Multi SIM(DSDS) @@ -870,19 +870,19 @@ SUPPORT_NR_DS := true USE_RADIO_HAL_2_0 := true #$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk) -#$(call inherit-product, vendor/google_devices/gs201/proprietary/device-vendor.mk) +#$(call inherit-product, vendor/google_devices/zuma/proprietary/device-vendor.mk) ifneq ($(BOARD_WITHOUT_RADIO),true) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) endif #GPS HAL -include device/google/gs201/gnss/device-gnss.mk -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/gps +include device/google/zuma/gnss/device-gnss.mk +BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/gps $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) #$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk) -#$(call inherit-product-if-exists, hardware/google_devices/gs201/gs201.mk) +#$(call inherit-product-if-exists, hardware/google_devices/zuma/zuma.mk) #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk) #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk) $(call inherit-product-if-exists, vendor/google/sensors/usf/android/usf_efw_product.mk) @@ -890,8 +890,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/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 \ + device/google/zuma/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \ + device/google/zuma/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 @@ -902,10 +902,10 @@ PRODUCT_PACKAGES += modem_logging_control # modem logging configs PRODUCT_COPY_FILES += \ - device/google/gs201/radio/config/logging.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/logging.conf \ - device/google/gs201/radio/config/default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.cfg \ - device/google/gs201/radio/config/default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.nprf \ - device/google/gs201/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml + device/google/zuma/radio/config/logging.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/logging.conf \ + device/google/zuma/radio/config/default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.cfg \ + device/google/zuma/radio/config/default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.nprf \ + device/google/zuma/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml # ARM NN files ARM_COMPUTE_CL_ENABLE := 1 @@ -918,8 +918,8 @@ PRODUCT_PACKAGES_DEBUG += \ $(NULL) PRODUCT_PACKAGES += \ - android.hardware.health-service.gs201 \ - android.hardware.health-service.gs201_recovery \ + android.hardware.health-service.zuma \ + android.hardware.health-service.zuma_recovery \ # Audio # Audio HAL Server & Default Implementations @@ -1032,7 +1032,7 @@ include hardware/google/pixel/thermal/device.mk PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true ## TPU packages -include device/google/gs201/edgetpu/edgetpu.mk +include device/google/zuma/edgetpu/edgetpu.mk # Connectivity Thermal Power Manager PRODUCT_PACKAGES += \ @@ -1085,7 +1085,7 @@ 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/gs201/device_framework_matrix_product.xml +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/zuma/device_framework_matrix_product.xml # Keymint configuration PRODUCT_COPY_FILES += \ diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk index 05586dfb..c7e454eb 100644 --- a/dumpstate/Android.mk +++ b/dumpstate/Android.mk @@ -16,11 +16,11 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.dumpstate@1.1-service.gs201 +LOCAL_MODULE := android.hardware.dumpstate@1.1-service.zuma LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE -LOCAL_INIT_RC := android.hardware.dumpstate@1.1-service.gs201.rc +LOCAL_INIT_RC := android.hardware.dumpstate@1.1-service.zuma.rc LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ diff --git a/dumpstate/android.hardware.dumpstate@1.1-service.gs201.rc b/dumpstate/android.hardware.dumpstate@1.1-service.zuma.rc similarity index 91% rename from dumpstate/android.hardware.dumpstate@1.1-service.gs201.rc rename to dumpstate/android.hardware.dumpstate@1.1-service.zuma.rc index b18b7555..e98cc755 100644 --- a/dumpstate/android.hardware.dumpstate@1.1-service.gs201.rc +++ b/dumpstate/android.hardware.dumpstate@1.1-service.zuma.rc @@ -1,4 +1,4 @@ -service vendor.dumpstate-1-1 /vendor/bin/hw/android.hardware.dumpstate@1.1-service.gs201 +service vendor.dumpstate-1-1 /vendor/bin/hw/android.hardware.dumpstate@1.1-service.zuma class hal user system group system diff --git a/dumpstate/service.cpp b/dumpstate/service.cpp index 7633c02a..012f3d23 100644 --- a/dumpstate/service.cpp +++ b/dumpstate/service.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#define LOG_TAG "android.hardware.dumpstate@1.0-service.gs201" +#define LOG_TAG "android.hardware.dumpstate@1.0-service.zuma" #include #include diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk index c97b5abc..2ee6edaa 100644 --- a/edgetpu/edgetpu.mk +++ b/edgetpu/edgetpu.mk @@ -25,4 +25,4 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ libmetrics_logger BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/edgetpu/ -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/edgetpu/ +BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/edgetpu/ diff --git a/factory/framework/Android.bp b/factory/framework/Android.bp index aa9098de..3b91f9b0 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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } diff --git a/factory/launcher3/Android.bp b/factory/launcher3/Android.bp index 109ad5e1..9d0ed8ec 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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } diff --git a/factory/settings/Android.bp b/factory/settings/Android.bp index 3db1861d..cbbc51b7 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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } diff --git a/factory_common.mk b/factory_common.mk index fc745873..406b91bf 100644 --- a/factory_common.mk +++ b/factory_common.mk @@ -14,8 +14,8 @@ # limitations under the License. # -$(call inherit-product, device/google/gs201/aosp_common.mk) -$(call inherit-product-if-exists, vendor/google_devices/gs201/factory/pixel/device-factory.mk) +$(call inherit-product, device/google/zuma/aosp_common.mk) +$(call inherit-product-if-exists, vendor/google_devices/zuma/factory/pixel/device-factory.mk) PRODUCT_PROPERTY_OVERRIDES += service.adb.root=1 \ ro.vendor.factory=1 @@ -61,10 +61,10 @@ BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive PRODUCT_SET_DEBUGFS_RESTRICTIONS := false # Disable Bluetooth as default in factory build -DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory +DEVICE_PACKAGE_OVERLAYS += device/google/zuma/overlay-factory PRODUCT_COPY_FILES += \ - device/google/gs201/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc + device/google/zuma/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/factory_boost diff --git a/fingerprint/fpc1540/fpc1540.mk b/fingerprint/fpc1540/fpc1540.mk index 779af80e..b8563b62 100644 --- a/fingerprint/fpc1540/fpc1540.mk +++ b/fingerprint/fpc1540/fpc1540.mk @@ -1,5 +1,5 @@ # Fingerprint -include device/google/gs201/fingerprint/fpc1540/fingerprint_config.mk +include device/google/zuma/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 968e1d3c..5cf4f48a 100644 --- a/fingerprint/fpc1540/fpc1540_factory.mk +++ b/fingerprint/fpc1540/fpc1540_factory.mk @@ -1,5 +1,5 @@ # Fingerprint -include device/google/gs201/fingerprint/fpc1540/fingerprint_config_factory.mk +include device/google/zuma/fingerprint/fpc1540/fingerprint_config_factory.mk PRODUCT_PACKAGES += \ fpc_tee_test\ diff --git a/gnss/47765/Android.bp b/gnss/47765/Android.bp index 8ce2dd05..a8a1683d 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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } diff --git a/gnss/device-gnss.mk b/gnss/device-gnss.mk index 08afe191..ca40c778 100644 --- a/gnss/device-gnss.mk +++ b/gnss/device-gnss.mk @@ -1,20 +1,20 @@ 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/gs201/gnss/47765/config/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \ - device/google/gs201/gnss/47765/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch + device/google/zuma/gnss/47765/config/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \ + device/google/zuma/gnss/47765/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - device/google/gs201/gnss/47765/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/gs201/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/zuma/gnss/47765/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/zuma/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf else PRODUCT_COPY_FILES += \ - device/google/gs201/gnss/47765/config/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/gs201/gnss/47765/config/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + device/google/zuma/gnss/47765/config/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/zuma/gnss/47765/config/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf endif PRODUCT_SOONG_NAMESPACES += \ - device/google/gs201/gnss/47765 + device/google/zuma/gnss/47765 PRODUCT_PACKAGES += \ android.hardware.gnss@2.1-impl-google \ diff --git a/health/Android.bp b/health/Android.bp index 01ca99eb..5501f659 100644 --- a/health/Android.bp +++ b/health/Android.bp @@ -17,22 +17,22 @@ 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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } cc_defaults { - name: "android.hardware.health-service.gs201-defaults", + name: "android.hardware.health-service.zuma-defaults", defaults: [ "libhealth_aidl_impl_user", "libhealth_aidl_charger_defaults", ], relative_install_path: "hw", - vintf_fragments: ["android.hardware.health-service.gs201.xml"], + vintf_fragments: ["android.hardware.health-service.zuma.xml"], srcs: [ "Health.cpp", ], @@ -48,10 +48,10 @@ cc_defaults { } cc_binary { - name: "android.hardware.health-service.gs201", - defaults: ["android.hardware.health-service.gs201-defaults"], + name: "android.hardware.health-service.zuma", + defaults: ["android.hardware.health-service.zuma-defaults"], proprietary: true, - init_rc: ["android.hardware.health-service.gs201.rc"], + init_rc: ["android.hardware.health-service.zuma.rc"], overrides: ["charger"], shared_libs: [ "libpixelhealth", @@ -59,9 +59,9 @@ cc_binary { } cc_binary { - name: "android.hardware.health-service.gs201_recovery", - defaults: ["android.hardware.health-service.gs201-defaults"], + name: "android.hardware.health-service.zuma_recovery", + defaults: ["android.hardware.health-service.zuma-defaults"], recovery: true, - init_rc: ["android.hardware.health-service.gs201_recovery.rc"], + init_rc: ["android.hardware.health-service.zuma_recovery.rc"], overrides: ["charger.recovery"], } diff --git a/health/Health.cpp b/health/Health.cpp index 453c151a..2081d020 100644 --- a/health/Health.cpp +++ b/health/Health.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#define LOG_TAG "android.hardware.health@2.1-impl-gs201" +#define LOG_TAG "android.hardware.health@2.1-impl-zuma" #include #include diff --git a/health/android.hardware.health-service.gs201.rc b/health/android.hardware.health-service.zuma.rc similarity index 80% rename from health/android.hardware.health-service.gs201.rc rename to health/android.hardware.health-service.zuma.rc index bff83a39..c83fc56f 100644 --- a/health/android.hardware.health-service.gs201.rc +++ b/health/android.hardware.health-service.zuma.rc @@ -1,11 +1,11 @@ -service vendor.health-gs201 /vendor/bin/hw/android.hardware.health-service.gs201 +service vendor.health-zuma /vendor/bin/hw/android.hardware.health-service.zuma class hal user system group system capabilities WAKE_ALARM BLOCK_SUSPEND file /dev/kmsg w -service vendor.charger /vendor/bin/hw/android.hardware.health-service.gs201 --charger +service vendor.charger /vendor/bin/hw/android.hardware.health-service.zuma --charger class charger seclabel u:r:charger_vendor:s0 user system diff --git a/health/android.hardware.health-service.gs201.xml b/health/android.hardware.health-service.zuma.xml similarity index 100% rename from health/android.hardware.health-service.gs201.xml rename to health/android.hardware.health-service.zuma.xml diff --git a/health/android.hardware.health-service.gs201_recovery.rc b/health/android.hardware.health-service.zuma_recovery.rc similarity index 62% rename from health/android.hardware.health-service.gs201_recovery.rc rename to health/android.hardware.health-service.zuma_recovery.rc index ddaeaa5e..32419abd 100644 --- a/health/android.hardware.health-service.gs201_recovery.rc +++ b/health/android.hardware.health-service.zuma_recovery.rc @@ -1,4 +1,4 @@ -service vendor.health-gs201 /system/bin/hw/android.hardware.health-service.gs201_recovery +service vendor.health-zuma /system/bin/hw/android.hardware.health-service.zuma_recovery class hal seclabel u:r:hal_health_default:s0 user system diff --git a/init.insmod.gs201.cfg b/init.insmod.zuma.cfg similarity index 100% rename from init.insmod.gs201.cfg rename to init.insmod.zuma.cfg diff --git a/interfaces/boot/1.0/Android.bp b/interfaces/boot/1.0/Android.bp index a5937e78..5599fafb 100644 --- a/interfaces/boot/1.0/Android.bp +++ b/interfaces/boot/1.0/Android.bp @@ -16,20 +16,20 @@ 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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } cc_binary { - name: "android.hardware.boot@1.0-service-gs201", + name: "android.hardware.boot@1.0-service-zuma", defaults: ["hidl_defaults"], relative_install_path: "hw", vendor: true, - init_rc: ["android.hardware.boot@1.0-service-gs201.rc"], + init_rc: ["android.hardware.boot@1.0-service-zuma.rc"], srcs: [ "BootControl.cpp", "GptUtils.cpp", @@ -47,7 +47,7 @@ cc_binary { } cc_library { - name: "android.hardware.boot@1.0-impl-gs201", + name: "android.hardware.boot@1.0-impl-zuma", recovery: true, srcs: [ "BootControl.cpp", diff --git a/interfaces/boot/1.0/android.hardware.boot@1.0-service-gs201.rc b/interfaces/boot/1.0/android.hardware.boot@1.0-service-zuma.rc similarity index 85% rename from interfaces/boot/1.0/android.hardware.boot@1.0-service-gs201.rc rename to interfaces/boot/1.0/android.hardware.boot@1.0-service-zuma.rc index 7a7849fd..7997fded 100644 --- a/interfaces/boot/1.0/android.hardware.boot@1.0-service-gs201.rc +++ b/interfaces/boot/1.0/android.hardware.boot@1.0-service-zuma.rc @@ -1,4 +1,4 @@ -service vendor.boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service-gs201 +service vendor.boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service-zuma class early_hal user root group root diff --git a/interfaces/boot/1.2/Android.bp b/interfaces/boot/1.2/Android.bp index a9fb7f49..ba31f113 100644 --- a/interfaces/boot/1.2/Android.bp +++ b/interfaces/boot/1.2/Android.bp @@ -16,20 +16,20 @@ 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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } cc_binary { - name: "android.hardware.boot@1.2-service-gs201", + name: "android.hardware.boot@1.2-service-zuma", defaults: ["hidl_defaults"], relative_install_path: "hw", vendor: true, - init_rc: ["android.hardware.boot@1.2-service-gs201.rc"], + init_rc: ["android.hardware.boot@1.2-service-zuma.rc"], srcs: [ "BootControl.cpp", "GptUtils.cpp", @@ -54,8 +54,8 @@ cc_binary { } cc_library { - name: "android.hardware.boot@1.2-impl-gs201", - stem: "android.hardware.boot@1.0-impl-1.2-impl-gs201", + name: "android.hardware.boot@1.2-impl-zuma", + stem: "android.hardware.boot@1.0-impl-1.2-impl-zuma", recovery: true, srcs: [ "BootControl.cpp", diff --git a/interfaces/boot/1.2/android.hardware.boot@1.2-service-gs201.rc b/interfaces/boot/1.2/android.hardware.boot@1.2-service-zuma.rc similarity index 94% rename from interfaces/boot/1.2/android.hardware.boot@1.2-service-gs201.rc rename to interfaces/boot/1.2/android.hardware.boot@1.2-service-zuma.rc index 3457b5f0..c35f3f5f 100644 --- a/interfaces/boot/1.2/android.hardware.boot@1.2-service-gs201.rc +++ b/interfaces/boot/1.2/android.hardware.boot@1.2-service-zuma.rc @@ -1,4 +1,4 @@ -service vendor.boot-hal-1-2 /vendor/bin/hw/android.hardware.boot@1.2-service-gs201 +service vendor.boot-hal-1-2 /vendor/bin/hw/android.hardware.boot@1.2-service-zuma interface android.hardware.boot@1.0::IBootControl default interface android.hardware.boot@1.1::IBootControl default interface android.hardware.boot@1.2::IBootControl default diff --git a/keymaster/Android.bp b/keymaster/Android.bp index c9620ca8..444e4b74 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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } diff --git a/pixelstats/Android.bp b/pixelstats/Android.bp index 95f2bcf0..e56f8e4c 100644 --- a/pixelstats/Android.bp +++ b/pixelstats/Android.bp @@ -16,17 +16,17 @@ 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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } cc_binary { name: "pixelstats-vendor", - init_rc: ["pixelstats-vendor.gs201.rc"], + init_rc: ["pixelstats-vendor.zuma.rc"], srcs: [ "service.cpp", ], diff --git a/pixelstats/pixelstats-vendor.gs201.rc b/pixelstats/pixelstats-vendor.zuma.rc similarity index 100% rename from pixelstats/pixelstats-vendor.gs201.rc rename to pixelstats/pixelstats-vendor.zuma.rc diff --git a/powerstats/Android.bp b/powerstats/Android.bp index 3991c149..5f6bcc32 100644 --- a/powerstats/Android.bp +++ b/powerstats/Android.bp @@ -22,16 +22,16 @@ 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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } cc_library { - name: "android.hardware.power.stats-impl.gs201", + name: "android.hardware.power.stats-impl.zuma", vendor_available: true, export_include_dirs: ["include"], defaults: ["powerstats_pixel_defaults"], diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/ZumaCommonDataProviders.cpp similarity index 99% rename from powerstats/Gs201CommonDataProviders.cpp rename to powerstats/ZumaCommonDataProviders.cpp index 6232a6e0..bcdd933e 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/ZumaCommonDataProviders.cpp @@ -15,7 +15,7 @@ */ #include -#include +#include #include #include #include @@ -638,7 +638,7 @@ void addPixelStateResidencyDataProvider(std::shared_ptr p) { p->addStateResidencyDataProvider(std::move(pixelSdp)); } -void addGs201CommonDataProviders(std::shared_ptr p) { +void addZumaCommonDataProviders(std::shared_ptr p) { setEnergyMeter(p); addPixelStateResidencyDataProvider(p); diff --git a/powerstats/include/Gs201CommonDataProviders.h b/powerstats/include/ZumaCommonDataProviders.h similarity index 92% rename from powerstats/include/Gs201CommonDataProviders.h rename to powerstats/include/ZumaCommonDataProviders.h index a4b9232a..15b8050f 100644 --- a/powerstats/include/Gs201CommonDataProviders.h +++ b/powerstats/include/ZumaCommonDataProviders.h @@ -20,6 +20,6 @@ using aidl::android::hardware::power::stats::PowerStats; -void addGs201CommonDataProviders(std::shared_ptr p); +void addZumaCommonDataProviders(std::shared_ptr p); void addNFC(std::shared_ptr p, const std::string& path); diff --git a/rro_overlays/EuiccSupportPixelOverlay/Android.bp b/rro_overlays/EuiccSupportPixelOverlay/Android.bp index 182807b3..3bc26e2e 100644 --- a/rro_overlays/EuiccSupportPixelOverlay/Android.bp +++ b/rro_overlays/EuiccSupportPixelOverlay/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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } diff --git a/rro_overlays/EuiccSupportPixelOverlay/AndroidManifest.xml b/rro_overlays/EuiccSupportPixelOverlay/AndroidManifest.xml index 125aadc0..e0175ea1 100644 --- a/rro_overlays/EuiccSupportPixelOverlay/AndroidManifest.xml +++ b/rro_overlays/EuiccSupportPixelOverlay/AndroidManifest.xml @@ -15,7 +15,7 @@ --> diff --git a/sensors/Android.mk b/sensors/Android.mk index 996e03fd..530c8955 100644 --- a/sensors/Android.mk +++ b/sensors/Android.mk @@ -23,7 +23,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware LOCAL_SRC_FILES := sensors_dummy.c -LOCAL_MODULE := sensors.gs201 +LOCAL_MODULE := sensors.zuma LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE diff --git a/usb/gadget/Android.bp b/usb/gadget/Android.bp index 502c339f..f140e4c0 100644 --- a/usb/gadget/Android.bp +++ b/usb/gadget/Android.bp @@ -16,10 +16,10 @@ 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_gs201_license" + // all of the 'license_kinds' from "device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["device_google_gs201_license"], + default_applicable_licenses: ["device_google_zuma_license"], } cc_binary { diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp index 8fe69929..b5ed314c 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "android.hardware.usb.gadget@1.2-service.gs201" +#define LOG_TAG "android.hardware.usb.gadget@1.2-service.zuma" #include "UsbGadget.h" #include diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index 961079dc..d9311e3d 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/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/gs201:device_google_gs201_license" + // all of the 'license_kinds' from "//device/google/zuma:device_google_zuma_license" // to get the below license kinds: // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: [ - "//device/google/gs201:device_google_gs201_license", + "//device/google/zuma:device_google_zuma_license", ], } diff --git a/widevine/device.mk b/widevine/device.mk index 467aa386..c4872939 100644 --- a/widevine/device.mk +++ b/widevine/device.mk @@ -1,4 +1,4 @@ PRODUCT_PACKAGES += \ android.hardware.drm-service.clearkey \ android.hardware.drm-service.widevine -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs201-sepolicy/widevine +BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/widevine diff --git a/wifi/qcom/BoardConfig-wifi.mk b/wifi/qcom/BoardConfig-wifi.mk index b49c7b21..0c276be6 100644 --- a/wifi/qcom/BoardConfig-wifi.mk +++ b/wifi/qcom/BoardConfig-wifi.mk @@ -14,7 +14,7 @@ # limitations under the License. # -LOCAL_WIFI_PATH := device/google/gs201/wifi/qcom +LOCAL_WIFI_PATH := device/google/zuma/wifi/qcom # wlan flags BOARD_WLAN_DEVICE := qcwcn