diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:45:05 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:45:05 +0000 |
| commit | 388f6c98acc9491042116e78e86a6f090b7fcf72 (patch) | |
| tree | 46825fee6cb8ab987bfa89ceaa96cf9dfb7f3072 | |
| parent | cc13972cb42b6e42cf29824aef915275ec99b63b (diff) | |
| parent | 4c2733094606774f71382d5bb8c5f95e8cef5b0b (diff) | |
| download | atv-simpleperf-release.tar.gz | |
Snap for 11400057 from 4c2733094606774f71382d5bb8c5f95e8cef5b0b to simpleperf-releasesimpleperf-release
Change-Id: I29d2cf255ad9e2b65953aa504c9fb8090695f299
| -rw-r--r-- | OWNERS | 3 | ||||
| -rw-r--r-- | libraries/BluetoothServices/Android.bp | 3 | ||||
| -rw-r--r-- | products/aosp_tv_x86.mk | 2 | ||||
| -rw-r--r-- | products/atv_lowram_defaults.mk | 10 | ||||
| -rw-r--r-- | products/atv_system_ext.mk | 2 |
5 files changed, 10 insertions, 10 deletions
@@ -7,9 +7,6 @@ qingxun@google.com shaopengjia@google.com #{LAST_RESORT_SUGGESTION} tolstykh@google.com -# TV emulator and boot logo -kozachuk@google.com - # GSI targets hgchen@google.com wyau@google.com diff --git a/libraries/BluetoothServices/Android.bp b/libraries/BluetoothServices/Android.bp index 0d9ffc1..d4da217 100644 --- a/libraries/BluetoothServices/Android.bp +++ b/libraries/BluetoothServices/Android.bp @@ -23,4 +23,7 @@ android_library { resource_dirs: ["res"], manifest: "AndroidManifest.xml", sdk_version: "system_current", + lint: { + baseline_filename: "lint-baseline.xml", + }, } diff --git a/products/aosp_tv_x86.mk b/products/aosp_tv_x86.mk index 3b9083b..4c5fa9f 100644 --- a/products/aosp_tv_x86.mk +++ b/products/aosp_tv_x86.mk @@ -57,7 +57,7 @@ PRODUCT_PACKAGES += \ # All components inherited here go to vendor image # $(call inherit-product, device/google/atv/products/atv_emulator_vendor.mk) -$(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk) +$(call inherit-product, device/generic/goldfish/board/emu64x/kernel_fstab_32.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) ifeq (aosp_tv_x86,$(TARGET_PRODUCT)) diff --git a/products/atv_lowram_defaults.mk b/products/atv_lowram_defaults.mk index 7ce3557..aa43ae5 100644 --- a/products/atv_lowram_defaults.mk +++ b/products/atv_lowram_defaults.mk @@ -39,14 +39,14 @@ PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := false # leave less information available via JDWP. PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true -# Disable Scudo outside of eng builds to save RAM. -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) - PRODUCT_DISABLE_SCUDO := true -endif - # Add the system properties. TARGET_SYSTEM_PROP += \ build/make/target/board/go_defaults_common.prop # Dedupe VNDK libraries with identical core variants. TARGET_VNDK_USE_CORE_VARIANT := true + +# Use the low memory allocator outside of eng builds to save RSS. +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) + MALLOC_SVELTE := true +endif diff --git a/products/atv_system_ext.mk b/products/atv_system_ext.mk index 14d2493..68f7755 100644 --- a/products/atv_system_ext.mk +++ b/products/atv_system_ext.mk @@ -19,7 +19,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk) PRODUCT_PACKAGES += \ blur_sysprop_notifier \ - SystemUI \ + TvSystemUI \ TvFrameworkPackageStubs \ TvSettings |