s/gs101/gs201
do a global substitution
Bug: 186836335
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: Ic79e8983d04615be7da70ebb2b5092aae5178495
diff --git a/Android.bp b/Android.bp
index 57ebe85..9b83b17 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6,7 +6,7 @@
}
package {
- default_applicable_licenses: ["device_google_gs101_license"],
+ default_applicable_licenses: ["device_google_gs201_license"],
}
// Added automatically by a large-scale-change that took the approach of
@@ -24,7 +24,7 @@
// used in the current project.
// See: http://go/android-license-faq
license {
- name: "device_google_gs101_license",
+ name: "device_google_gs201_license",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-Apache-2.0",
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 0851375..edc4e9e 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -20,7 +20,7 @@
PRODUCT_FULL_TREBLE_OVERRIDE := true
# HACK : To fix up after bring up multimedia devices.
-TARGET_SOC := gs101
+TARGET_SOC := gs201
TARGET_SOC_NAME := google
@@ -53,7 +53,7 @@
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_FSTAB := device/google/gs201/conf/fstab.gs101
+TARGET_RECOVERY_FSTAB := device/google/gs201/conf/fstab.gs201
TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
TARGET_RECOVERY_UI_LIB := \
@@ -238,7 +238,7 @@
BOARD_USES_EXYNOS_AFBC_FEATURE := true
#BOARD_USES_HDRUI_GLES_CONVERSION := true
-BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_gs101
+BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_gs201
BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin
# HWCServices
@@ -398,8 +398,8 @@
# Using BUILD_COPY_HEADERS
BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
-include device/google/gs101-sepolicy/gs101-sepolicy.mk
include device/google/gs201-sepolicy/gs201-sepolicy.mk
+include device/google/gs101-sepolicy/gs101-sepolicy.mk
# Battery options
BOARD_KERNEL_CMDLINE += at24.write_timeout=100
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1ca5183..41840d7 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -74,6 +74,6 @@
$(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.gs101)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/init/android.hardware.power.stats@1.0-service.gs101.rc)
-$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.power.stats@1.0-service.gs101.xml)
+$(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)
diff --git a/conf/fstab.gs101 b/conf/fstab.gs201
similarity index 100%
rename from conf/fstab.gs101
rename to conf/fstab.gs201
diff --git a/conf/init.gs101.rc b/conf/init.gs201.rc
similarity index 99%
rename from conf/init.gs101.rc
rename to conf/init.gs201.rc
index 36895b6..907194f 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs201.rc
@@ -1,4 +1,4 @@
-import init.gs101.usb.rc
+import init.gs201.usb.rc
import android.hardware.drm@1.2-service.widevine.rc
import init.exynos.sensorhub.rc
import /vendor/etc/init/hw/init.aoc.rc
@@ -249,7 +249,7 @@
class_start animation
# Mount RW partitions which need run fsck
- mount_all /vendor/etc/fstab.gs101 --late
+ mount_all /vendor/etc/fstab.gs201 --late
on post-fs-data
# Log data folder
@@ -442,7 +442,7 @@
setprop ro.radio.noril yes
on fs
- mount_all /vendor/etc/fstab.gs101 --early
+ mount_all /vendor/etc/fstab.gs201 --early
restorecon_recursive /mnt/vendor/efs
chown radio system /mnt/vendor/efs
restorecon_recursive /mnt/vendor/efs_backup
@@ -739,7 +739,7 @@
on property:persist.vendor.charge.start.level=*
write /sys/devices/platform/google,charger/charge_start_level ${persist.vendor.charge.start.level}
-service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.gs101.cfg
+service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.gs201.cfg
class main
user root
group root system
diff --git a/conf/init.gs101.usb.rc b/conf/init.gs201.usb.rc
similarity index 100%
rename from conf/init.gs101.usb.rc
rename to conf/init.gs201.usb.rc
diff --git a/conf/ueventd.gs101.rc b/conf/ueventd.gs201.rc
similarity index 100%
rename from conf/ueventd.gs101.rc
rename to conf/ueventd.gs201.rc
diff --git a/device-common.mk b/device-common.mk
index 44bd8f3..96db574 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -25,7 +25,7 @@
# Set system properties identifying the chipset
PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google
-PRODUCT_VENDOR_PROPERTIES += ro.soc.model=GS101
+PRODUCT_VENDOR_PROPERTIES += ro.soc.model=GS201
PRODUCT_PRODUCT_PROPERTIES += \
persist.vendor.testing_battery_profile=0
diff --git a/device-shipping-common.mk b/device-shipping-common.mk
index a0a2aa0..61b19d3 100644
--- a/device-shipping-common.mk
+++ b/device-shipping-common.mk
@@ -26,5 +26,5 @@
# 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 d861cc6..1133840 100644
--- a/device.mk
+++ b/device.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-TARGET_BOARD_PLATFORM := gs101
+TARGET_BOARD_PLATFORM := gs201
ifneq (,$(filter %_64,$(TARGET_PRODUCT)))
LOCAL_64ONLY := _64
@@ -33,7 +33,7 @@
hardware/google/av \
hardware/google/gchips \
hardware/google/graphics/common \
- hardware/google/graphics/gs101 \
+ hardware/google/graphics/gs201 \
hardware/google/interfaces \
hardware/google/pixel \
device/google/gs201 \
@@ -191,11 +191,11 @@
# Init files
PRODUCT_COPY_FILES += \
$(LOCAL_KERNEL):kernel \
- 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
+ device/google/gs201/conf/init.gs201.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.gs201.usb.rc \
+ device/google/gs201/conf/ueventd.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc
PRODUCT_COPY_FILES += \
- device/google/gs201/conf/init.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.rc
+ device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
@@ -213,13 +213,13 @@
# Recovery files
PRODUCT_COPY_FILES += \
- device/google/gs201/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.gs201.rc
# Fstab files
PRODUCT_COPY_FILES += \
- device/google/gs201/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.gs101 \
+ device/google/gs201/conf/fstab.gs201:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.gs201 \
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
+ device/google/gs201/conf/fstab.gs201:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.gs201
# Shell scripts
PRODUCT_COPY_FILES += \
@@ -227,7 +227,7 @@
# insmod files
PRODUCT_COPY_FILES += \
- device/google/gs201/init.insmod.gs101.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.gs101.cfg
+ device/google/gs201/init.insmod.gs201.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.gs201.cfg
# For creating dtbo image
PRODUCT_HOST_PACKAGES += \
@@ -316,7 +316,7 @@
# USB HAL
PRODUCT_PACKAGES += \
- android.hardware.usb@1.3-service.gs101
+ android.hardware.usb@1.3-service.gs201
# MIDI feature
PRODUCT_COPY_FILES += \
@@ -354,7 +354,7 @@
# dumpstate HAL
PRODUCT_PACKAGES += \
- android.hardware.dumpstate@1.1-service.gs101
+ android.hardware.dumpstate@1.1-service.gs201
# AoC support
PRODUCT_PACKAGES += \
@@ -465,7 +465,7 @@
ghawb_truetone \
target_device
-SOONG_CONFIG_google3a_config_soc := gs101
+SOONG_CONFIG_google3a_config_soc := gs201
SOONG_CONFIG_google3a_config_gcam_awb := true
SOONG_CONFIG_google3a_config_ghawb_truetone := true
SOONG_CONFIG_google3a_config_target_device := $(LOCAL_TARGET_PRODUCT)
@@ -657,7 +657,7 @@
SOONG_CONFIG_NAMESPACES += bigo
SOONG_CONFIG_bigo += soc
-SOONG_CONFIG_bigo_soc := gs101
+SOONG_CONFIG_bigo_soc := gs201
# MFC firmware
PRODUCT_COPY_FILES += \
@@ -846,7 +846,7 @@
libbccArm32 \
libmalicore32 \
libOpenCL32 \
- vulkan.gs10132
+ vulkan.gs20132
endif
PRODUCT_PACKAGES += \
@@ -856,7 +856,7 @@
libbccArm \
libmalicore \
libOpenCL \
- vulkan.gs101 \
+ vulkan.gs201 \
whitelist \
libstagefright_hdcp \
libskia_opt
@@ -891,8 +891,8 @@
# Boot Control HAL
PRODUCT_PACKAGES += \
- android.hardware.boot@1.2-impl-gs101 \
- android.hardware.boot@1.2-service-gs101
+ android.hardware.boot@1.2-impl-gs201 \
+ android.hardware.boot@1.2-service-gs201
# Exynos RIL and telephony
# Multi SIM(DSDS)
@@ -916,7 +916,7 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
endif
#$(call inherit-product, hardware/google_devices/exynos5/exynos5.mk)
-#$(call inherit-product-if-exists, hardware/google_devices/gs101/gs101.mk)
+#$(call inherit-product-if-exists, hardware/google_devices/gs201/gs201.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)
@@ -967,7 +967,7 @@
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml
PRODUCT_PACKAGES += \
- android.hardware.health@2.1-impl-gs101 \
+ android.hardware.health@2.1-impl-gs201 \
android.hardware.health@2.1-service
# Audio
diff --git a/dumpstate/Android.mk b/dumpstate/Android.mk
index d9fee2c..05586df 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.gs101
+LOCAL_MODULE := android.hardware.dumpstate@1.1-service.gs201
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.gs101.rc
+LOCAL_INIT_RC := android.hardware.dumpstate@1.1-service.gs201.rc
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := \
diff --git a/dumpstate/android.hardware.dumpstate@1.1-service.gs101.rc b/dumpstate/android.hardware.dumpstate@1.1-service.gs201.rc
similarity index 90%
rename from dumpstate/android.hardware.dumpstate@1.1-service.gs101.rc
rename to dumpstate/android.hardware.dumpstate@1.1-service.gs201.rc
index 6be0278..b18b755 100644
--- a/dumpstate/android.hardware.dumpstate@1.1-service.gs101.rc
+++ b/dumpstate/android.hardware.dumpstate@1.1-service.gs201.rc
@@ -1,4 +1,4 @@
-service vendor.dumpstate-1-1 /vendor/bin/hw/android.hardware.dumpstate@1.1-service.gs101
+service vendor.dumpstate-1-1 /vendor/bin/hw/android.hardware.dumpstate@1.1-service.gs201
class hal
user system
group system
diff --git a/dumpstate/service.cpp b/dumpstate/service.cpp
index 4717231..7633c02 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.gs101"
+#define LOG_TAG "android.hardware.dumpstate@1.0-service.gs201"
#include <hidl/HidlSupport.h>
#include <hidl/HidlTransportSupport.h>
diff --git a/factory/framework/Android.bp b/factory/framework/Android.bp
index 29e6eb3..aa9098d 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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
diff --git a/factory/launcher3/Android.bp b/factory/launcher3/Android.bp
index 27c8e1a..109ad5e 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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
diff --git a/factory/settings/Android.bp b/factory/settings/Android.bp
index 2a1efc0..3db1861 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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
diff --git a/gnss/47765/Android.bp b/gnss/47765/Android.bp
index 5aca3c7..53a7d2d 100644
--- a/gnss/47765/Android.bp
+++ b/gnss/47765/Android.bp
@@ -18,11 +18,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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
diff --git a/health/Android.bp b/health/Android.bp
index 8cb67d7..b8a6a55 100644
--- a/health/Android.bp
+++ b/health/Android.bp
@@ -17,17 +17,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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
cc_library_shared {
- name: "android.hardware.health@2.1-impl-gs101",
- stem: "android.hardware.health@2.0-impl-2.1-gs101",
+ name: "android.hardware.health@2.1-impl-gs201",
+ stem: "android.hardware.health@2.0-impl-2.1-gs201",
proprietary: true,
relative_install_path: "hw",
diff --git a/health/Health.cpp b/health/Health.cpp
index f2b57be..5d2f7e9 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-gs101"
+#define LOG_TAG "android.hardware.health@2.1-impl-gs201"
#include <android-base/logging.h>
#include <android-base/file.h>
diff --git a/init.insmod.gs101.cfg b/init.insmod.gs201.cfg
similarity index 100%
rename from init.insmod.gs101.cfg
rename to init.insmod.gs201.cfg
diff --git a/interfaces/boot/1.0/Android.bp b/interfaces/boot/1.0/Android.bp
index 0c2c212..a5937e7 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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
cc_binary {
- name: "android.hardware.boot@1.0-service-gs101",
+ name: "android.hardware.boot@1.0-service-gs201",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
vendor: true,
- init_rc: ["android.hardware.boot@1.0-service-gs101.rc"],
+ init_rc: ["android.hardware.boot@1.0-service-gs201.rc"],
srcs: [
"BootControl.cpp",
"GptUtils.cpp",
@@ -47,7 +47,7 @@
}
cc_library {
- name: "android.hardware.boot@1.0-impl-gs101",
+ name: "android.hardware.boot@1.0-impl-gs201",
recovery: true,
srcs: [
"BootControl.cpp",
diff --git a/interfaces/boot/1.0/android.hardware.boot@1.0-service-gs101.rc b/interfaces/boot/1.0/android.hardware.boot@1.0-service-gs201.rc
similarity index 85%
rename from interfaces/boot/1.0/android.hardware.boot@1.0-service-gs101.rc
rename to interfaces/boot/1.0/android.hardware.boot@1.0-service-gs201.rc
index 24a4b45..7a7849f 100644
--- a/interfaces/boot/1.0/android.hardware.boot@1.0-service-gs101.rc
+++ b/interfaces/boot/1.0/android.hardware.boot@1.0-service-gs201.rc
@@ -1,4 +1,4 @@
-service vendor.boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service-gs101
+service vendor.boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service-gs201
class early_hal
user root
group root
diff --git a/interfaces/boot/1.2/Android.bp b/interfaces/boot/1.2/Android.bp
index f04635f..a9fb7f4 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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
cc_binary {
- name: "android.hardware.boot@1.2-service-gs101",
+ name: "android.hardware.boot@1.2-service-gs201",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
vendor: true,
- init_rc: ["android.hardware.boot@1.2-service-gs101.rc"],
+ init_rc: ["android.hardware.boot@1.2-service-gs201.rc"],
srcs: [
"BootControl.cpp",
"GptUtils.cpp",
@@ -54,8 +54,8 @@
}
cc_library {
- name: "android.hardware.boot@1.2-impl-gs101",
- stem: "android.hardware.boot@1.0-impl-1.2-impl-gs101",
+ name: "android.hardware.boot@1.2-impl-gs201",
+ stem: "android.hardware.boot@1.0-impl-1.2-impl-gs201",
recovery: true,
srcs: [
"BootControl.cpp",
diff --git a/interfaces/boot/1.2/android.hardware.boot@1.2-service-gs101.rc b/interfaces/boot/1.2/android.hardware.boot@1.2-service-gs201.rc
similarity index 93%
rename from interfaces/boot/1.2/android.hardware.boot@1.2-service-gs101.rc
rename to interfaces/boot/1.2/android.hardware.boot@1.2-service-gs201.rc
index b0b14dc..3457b5f 100644
--- a/interfaces/boot/1.2/android.hardware.boot@1.2-service-gs101.rc
+++ b/interfaces/boot/1.2/android.hardware.boot@1.2-service-gs201.rc
@@ -1,4 +1,4 @@
-service vendor.boot-hal-1-2 /vendor/bin/hw/android.hardware.boot@1.2-service-gs101
+service vendor.boot-hal-1-2 /vendor/bin/hw/android.hardware.boot@1.2-service-gs201
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 d233656..c9620ca 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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
diff --git a/pixelstats/Android.bp b/pixelstats/Android.bp
index 5d594d1..95f2bcf 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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
cc_binary {
name: "pixelstats-vendor",
- init_rc: ["pixelstats-vendor.gs101.rc"],
+ init_rc: ["pixelstats-vendor.gs201.rc"],
srcs: [
"service.cpp",
],
diff --git a/pixelstats/pixelstats-vendor.gs101.rc b/pixelstats/pixelstats-vendor.gs201.rc
similarity index 100%
rename from pixelstats/pixelstats-vendor.gs101.rc
rename to pixelstats/pixelstats-vendor.gs201.rc
diff --git a/powerstats/Android.bp b/powerstats/Android.bp
index 82b864e..df23609 100644
--- a/powerstats/Android.bp
+++ b/powerstats/Android.bp
@@ -14,16 +14,16 @@
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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
cc_library {
- name: "android.hardware.power.stats-impl.gs101",
+ name: "android.hardware.power.stats-impl.gs201",
vendor_available: true,
export_include_dirs: ["include"],
defaults: ["powerstats_pixel_defaults"],
diff --git a/powerstats/Gs101CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp
similarity index 99%
rename from powerstats/Gs101CommonDataProviders.cpp
rename to powerstats/Gs201CommonDataProviders.cpp
index 5a14488..1c7529b 100644
--- a/powerstats/Gs101CommonDataProviders.cpp
+++ b/powerstats/Gs201CommonDataProviders.cpp
@@ -15,7 +15,7 @@
*/
#include <PowerStatsAidl.h>
-#include <Gs101CommonDataProviders.h>
+#include <Gs201CommonDataProviders.h>
#include "AocStateResidencyDataProvider.h"
#include "DevfreqStateResidencyDataProvider.h"
#include "DvfsStateResidencyDataProvider.h"
@@ -683,7 +683,7 @@
p->addStateResidencyDataProvider(std::move(pixelSdp));
}
-void addGs101CommonDataProviders(std::shared_ptr<PowerStats> p) {
+void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
setEnergyMeter(p);
addPixelStateResidencyDataProvider(p);
diff --git a/powerstats/include/Gs101CommonDataProviders.h b/powerstats/include/Gs201CommonDataProviders.h
similarity index 92%
rename from powerstats/include/Gs101CommonDataProviders.h
rename to powerstats/include/Gs201CommonDataProviders.h
index 98e6953..a4b9232 100644
--- a/powerstats/include/Gs101CommonDataProviders.h
+++ b/powerstats/include/Gs201CommonDataProviders.h
@@ -20,6 +20,6 @@
using aidl::android::hardware::power::stats::PowerStats;
-void addGs101CommonDataProviders(std::shared_ptr<PowerStats> p);
+void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p);
void addNFC(std::shared_ptr<PowerStats> p, const std::string& path);
diff --git a/rro_overlays/WifiOverlay/Android.bp b/rro_overlays/WifiOverlay/Android.bp
index 63e4094..f8197ae 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/gs201:device_google_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
diff --git a/sensors/Android.mk b/sensors/Android.mk
index ce844c9..996e03f 100644
--- a/sensors/Android.mk
+++ b/sensors/Android.mk
@@ -23,7 +23,7 @@
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware
LOCAL_SRC_FILES := sensors_dummy.c
-LOCAL_MODULE := sensors.gs101
+LOCAL_MODULE := sensors.gs201
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE
diff --git a/usb/Android.bp b/usb/Android.bp
index 9e37c7f..b1bbacc 100644
--- a/usb/Android.bp
+++ b/usb/Android.bp
@@ -16,21 +16,21 @@
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_gs101_license"
+ // all of the 'license_kinds' from "//device/google/gs201:device_google_gs201_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: [
- "//device/google/gs201:device_google_gs101_license",
+ "//device/google/gs201:device_google_gs201_license",
],
}
cc_binary {
- name: "android.hardware.usb@1.3-service.gs101",
+ name: "android.hardware.usb@1.3-service.gs201",
relative_install_path: "hw",
- init_rc: ["android.hardware.usb@1.3-service.gs101.rc"],
+ init_rc: ["android.hardware.usb@1.3-service.gs201.rc"],
vintf_fragments: [
- "android.hardware.usb@1.3-service.gs101.xml",
- "android.hardware.usb.gadget@1.2-service.gs101.xml",
+ "android.hardware.usb@1.3-service.gs201.xml",
+ "android.hardware.usb.gadget@1.2-service.gs201.xml",
],
srcs: ["service.cpp", "Usb.cpp", "UsbGadget.cpp"],
cflags: ["-Wall", "-Werror"],
diff --git a/usb/Usb.cpp b/usb/Usb.cpp
index 3270c46..3cb51c3 100644
--- a/usb/Usb.cpp
+++ b/usb/Usb.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.usb@1.3-service.gs101"
+#define LOG_TAG "android.hardware.usb@1.3-service.gs201"
#include <android-base/logging.h>
#include <android-base/properties.h>
diff --git a/usb/UsbGadget.cpp b/usb/UsbGadget.cpp
index efbf778..13426b7 100644
--- a/usb/UsbGadget.cpp
+++ b/usb/UsbGadget.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.usb.gadget@1.2-service.gs101"
+#define LOG_TAG "android.hardware.usb.gadget@1.2-service.gs201"
#include "UsbGadget.h"
#include <dirent.h>
diff --git a/usb/android.hardware.usb.gadget@1.2-service.gs101.xml b/usb/android.hardware.usb.gadget@1.2-service.gs201.xml
similarity index 100%
rename from usb/android.hardware.usb.gadget@1.2-service.gs101.xml
rename to usb/android.hardware.usb.gadget@1.2-service.gs201.xml
diff --git a/usb/android.hardware.usb@1.3-service.gs101.rc b/usb/android.hardware.usb@1.3-service.gs201.rc
similarity index 99%
rename from usb/android.hardware.usb@1.3-service.gs101.rc
rename to usb/android.hardware.usb@1.3-service.gs201.rc
index 615ae7e..8a66f58 100644
--- a/usb/android.hardware.usb@1.3-service.gs101.rc
+++ b/usb/android.hardware.usb@1.3-service.gs201.rc
@@ -1,4 +1,4 @@
-service vendor.usb-hal-1-3 /vendor/bin/hw/android.hardware.usb@1.3-service.gs101
+service vendor.usb-hal-1-3 /vendor/bin/hw/android.hardware.usb@1.3-service.gs201
class hal
user system
group system shell mtp
diff --git a/usb/android.hardware.usb@1.3-service.gs101.xml b/usb/android.hardware.usb@1.3-service.gs201.xml
similarity index 100%
rename from usb/android.hardware.usb@1.3-service.gs101.xml
rename to usb/android.hardware.usb@1.3-service.gs201.xml
diff --git a/usb/service.cpp b/usb/service.cpp
index a4a30d2..a613c36 100644
--- a/usb/service.cpp
+++ b/usb/service.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.usb@1.3-service.gs101"
+#define LOG_TAG "android.hardware.usb@1.3-service.gs201"
#include <hidl/HidlTransportSupport.h>
#include "Usb.h"
