diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-04-29 17:41:09 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-04-29 17:41:09 -0700 |
| commit | dc681a26629ef91aaaf3c02d6f6d5f8432d398d9 (patch) | |
| tree | 2cc95a051be4e238d74bcf69afffde52175fe52b | |
| parent | 644428297c47b98b21b83682d5d719d6323f82d2 (diff) | |
| parent | 140b37fd35d39cc6b103d1cfa143ce31a2111986 (diff) | |
Merge 140b37fd35d39cc6b103d1cfa143ce31a2111986 on remote branch
Change-Id: I55a12105c768e8a434d41f7f7c1c60c693b29c79
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | target/product/base_system.mk | 21 |
3 files changed, 23 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 2ba649c47e..5ef949a4a3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=SKQ1.220406.001 +BUILD_ID=SKQ1.220420.001 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 90cd2d806c..9b18e07e13 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -246,7 +246,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2022-03-05 + PLATFORM_SECURITY_PATCH := 2022-04-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH diff --git a/target/product/base_system.mk b/target/product/base_system.mk index c90b8afe62..0ab51aacf7 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -362,6 +362,27 @@ PRODUCT_VENDOR_PROPERTIES += ro.zygote?=zygote32 PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0 PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1 +PRODUCT_SYSTEM_PROPERTIES += \ + log.tag.CCodec=I \ + log.tag.MediaCodec=I \ + log.tag.MediaPlayerService=I \ + log.tag.CCodecBufferChannel=I \ + log.tag.MediaCodecSource=I \ + log.tag.NuPlayerRenderer=I \ + log.tag.NuPlayerDecoder=I \ + log.tag.NuPlayer=I \ + log.tag.MPEG4Writer=I \ + log.tag.CCodecBuffers=I \ + log.tag.CCodecConfig=I \ + log.tag.MediaCodecList=I \ + log.tag.FrameDecoder=I \ + log.tag.MediaMetadataRetriever=I \ + log.tag.MediaCodecsXmlParser=I \ + log.tag.NuPlayerDriver=I \ + log.tag.StagefrightRecorder=I \ + log.tag.GenericSource=I \ + log.tag.GraphicBufferSource=I + # Packages included only for eng or userdebug builds, previously debug tagged PRODUCT_PACKAGES_DEBUG := \ adb_keys \ |