Snap for 8130893 from fbe49ab851 to tm-release

Change-Id: I49cf3de2649a54d2ee8f39d1f706b9851e6ea8d9
This commit is contained in:
Android Build Coastguard Worker 2022-01-29 04:01:57 +00:00
commit d4e6c7904e
9 changed files with 24 additions and 24 deletions

View file

@ -32,7 +32,7 @@ TARGET_CPU_ABI := arm64-v8a
TARGET_CPU_VARIANT := cortex-a55
TARGET_CPU_VARIANT_RUNTIME := cortex-a55
ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
TARGET_2ND_ARCH := arm
TARGET_2ND_ARCH_VARIANT := armv8-a
TARGET_2ND_CPU_ABI := armeabi-v7a

View file

@ -17,7 +17,7 @@
#
# All components inherited here go to system image
#
ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
else
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)

View file

@ -82,7 +82,7 @@ on init
write /proc/sys/net/core/optmem_max 20480
write /proc/sys/net/core/netdev_max_backlog 10000
write /proc/sys/net/ipv4/tcp_rmem "2097152 4194304 8388608"
write /proc/sys/net/ipv4/tcp_wmem "262144 524288 1048576"
write /proc/sys/net/ipv4/tcp_wmem "262144 524288 8388608"
write /proc/sys/net/ipv4/tcp_mem "44259 59012 88518"
write /proc/sys/net/ipv4/udp_mem "88518 118025 177036"

View file

@ -18,7 +18,7 @@ include device/google/gs-common/device.mk
TARGET_BOARD_PLATFORM := gs101
ifneq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
ifneq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
LOCAL_64ONLY := _64
endif
@ -897,7 +897,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true)
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
endif
ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
else
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)

View file

@ -1,3 +1,12 @@
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "device_google_gs101_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: ["device_google_gs101_license"],
}
sh_binary {
name: "fingerprint.extension.sh",
init_rc: ["init.fingerprint.extension.rc"],

View file

@ -4,7 +4,7 @@ service vendor.health-gs101 /vendor/bin/hw/android.hardware.health-service.gs101
group system
capabilities WAKE_ALARM BLOCK_SUSPEND
file /dev/kmsg w
service vendor.charger-gs101 /vendor/bin/hw/android.hardware.health-service.gs101 --charger
service vendor.charger /vendor/bin/hw/android.hardware.health-service.gs101 --charger
class charger
seclabel u:r:charger_vendor:s0
user system

View file

@ -108,15 +108,6 @@
</interface>
<fqname>@1.3::IDevice/google-armnn</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.health</name>
<transport>hwbinder</transport>
<version>2.1</version>
<interface>
<name>IHealth</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl">
<name>com.google.input</name>
<interface>

View file

@ -109,15 +109,6 @@
<transport>hwbinder</transport>
<fqname>@1.3::IDevice/google-edgetpu</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.health</name>
<transport>hwbinder</transport>
<version>2.1</version>
<interface>
<name>IHealth</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl">
<name>com.google.input</name>
<interface>

View file

@ -14,6 +14,15 @@
// limitations under the License.
//
package {
// See: http://go/android-license-faq
// A large-scale-change added 'default_applicable_licenses' to import
// all of the 'license_kinds' from "device_google_gs101_license"
// to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
default_applicable_licenses: ["device_google_gs101_license"],
}
cc_binary {
name: "android.hardware.usb-service.gs101",
relative_install_path: "hw",