Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s/gs101/gs201

Browse source 
do a global substitution

Bug: 186836335
Signed-off-by: Pat Tjin <pattjin@google.com>
Change-Id: Ic79e8983d04615be7da70ebb2b5092aae5178495
This commit is contained in:
Pat Tjin 2021-05-19 21:37:18 -07:00 • committed by Aaron Ding
parent 6ec6628fc5
commit 89841bf57a
39 changed files with 89 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Android.bp
View file

@ -6,7 +6,7 @@ soong_namespace {
}
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 @@ package {
// 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",

8
BoardConfig-common.mk
View file

@ -20,7 +20,7 @@ include build/make/target/board/BoardConfigPixelCommon.mk
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_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_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 @@ HWC_SUPPORT_COLOR_TRANSFORM := true
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 @@ BOARD_VENDOR_RAMDISK_KERNEL_MODULES += \
# 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

6
CleanSpec.mk
View file

@ -74,6 +74,6 @@ $(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.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)

0
conf/fstab.gs101 → conf/fstab.gs201
View file

8
conf/init.gs101.rc → conf/init.gs201.rc
View file

@ -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 @@ on late-fs
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 @@ on property:persist.vendor.radio.no_modem_board=1
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.stop.level=*
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

0
conf/init.gs101.usb.rc → conf/init.gs201.usb.rc
View file

0
conf/ueventd.gs101.rc → conf/ueventd.gs201.rc
View file

2
device-common.mk
View file

@ -25,7 +25,7 @@ PRODUCT_COPY_FILES += \
# 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

4
device-shipping-common.mk
View file

@ -26,5 +26,5 @@ include device/google/gs201/device-common.mk
# 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

38
device.mk
View file

@ -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 @@ PRODUCT_SOONG_NAMESPACES += \
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 @@ PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
# 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 @@ endif
# 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 @@ PRODUCT_COPY_FILES += \
# 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 @@ PRODUCT_PACKAGES += \
# 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 @@ PRODUCT_PACKAGES += \
# 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 @@ SOONG_CONFIG_google3a_config += \
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 @@ endif
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 @@ PRODUCT_PACKAGES += \
libbccArm32 \
libmalicore32 \
libOpenCL32 \
vulkan.gs10132
vulkan.gs20132
endif
PRODUCT_PACKAGES += \
@ -856,7 +856,7 @@ PRODUCT_PACKAGES += \
libbccArm \
libmalicore \
libOpenCL \
vulkan.gs101 \
vulkan.gs201 \
whitelist \
libstagefright_hdcp \
libskia_opt
@ -891,8 +891,8 @@ PRODUCT_PACKAGES += ShannonRcs
# 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 @@ else
$(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 @@ PRODUCT_COPY_FILES += \
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

4
dumpstate/Android.mk
View file

@ -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 := \

2
dumpstate/android.hardware.dumpstate@1.1-service.gs101.rc → dumpstate/android.hardware.dumpstate@1.1-service.gs201.rc
View file

@ -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

2
dumpstate/service.cpp
View file

@ -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>

4
factory/framework/Android.bp
View file

@ -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",
],
}

4
factory/launcher3/Android.bp
View file

@ -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",
],
}

4
factory/settings/Android.bp
View file

@ -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",
],
}

4
gnss/47765/Android.bp
View file

@ -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_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",
],
}

8
health/Android.bp
View file

@ -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",

2
health/Health.cpp
View file

@ -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>

0
init.insmod.gs101.cfg → init.insmod.gs201.cfg
View file

10
interfaces/boot/1.0/Android.bp
View file

@ -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_binary {
}
cc_library {
name: "android.hardware.boot@1.0-impl-gs101",
name: "android.hardware.boot@1.0-impl-gs201",
recovery: true,
srcs: [
"BootControl.cpp",

2
interfaces/boot/1.0/android.hardware.boot@1.0-service-gs101.rc → interfaces/boot/1.0/android.hardware.boot@1.0-service-gs201.rc
View file

@ -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

12
interfaces/boot/1.2/Android.bp
View file

@ -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_binary {
}
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",

2
interfaces/boot/1.2/android.hardware.boot@1.2-service-gs101.rc → interfaces/boot/1.2/android.hardware.boot@1.2-service-gs201.rc
View file

@ -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

4
keymaster/Android.bp
View file

@ -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",
],
}

6
pixelstats/Android.bp
View file

@ -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",
],

0
pixelstats/pixelstats-vendor.gs101.rc → pixelstats/pixelstats-vendor.gs201.rc
View file

6
powerstats/Android.bp
View file

@ -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"],

4
powerstats/Gs101CommonDataProviders.cpp → powerstats/Gs201CommonDataProviders.cpp
View file

@ -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 @@ void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p) {
p->addStateResidencyDataProvider(std::move(pixelSdp));
}
void addGs101CommonDataProviders(std::shared_ptr<PowerStats> p) {
void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
setEnergyMeter(p);
addPixelStateResidencyDataProvider(p);

2
powerstats/include/Gs101CommonDataProviders.h → powerstats/include/Gs201CommonDataProviders.h
View file

@ -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);

4
rro_overlays/WifiOverlay/Android.bp
View file

@ -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",
],
}

2
sensors/Android.mk
View file

@ -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.gs101
LOCAL_MODULE := sensors.gs201
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE

12
usb/Android.bp
View file

@ -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"],

2
usb/Usb.cpp
View file

@ -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>

2
usb/UsbGadget.cpp
View file

@ -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>

0
usb/android.hardware.usb.gadget@1.2-service.gs101.xml → usb/android.hardware.usb.gadget@1.2-service.gs201.xml
View file

2
usb/android.hardware.usb@1.3-service.gs101.rc → usb/android.hardware.usb@1.3-service.gs201.rc
View file

@ -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

0
usb/android.hardware.usb@1.3-service.gs101.xml → usb/android.hardware.usb@1.3-service.gs201.xml
View file

2
usb/service.cpp
View file

@ -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"