From 02f95cfee5c9909b64a1e8b887ec2e52fe86aa3d Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Wed, 10 Jul 2024 08:08:08 +0000 Subject: [PATCH 1/2] Update allowlist based on internal system image Allowlist of system image diff is generated based on the AOSP main, but this is not sufficient for internal main as it contains more items in the aosp_cf_x86_64_phone system image. This change adds more items in diff so aosp_cf_x86_64_phone build won't break from system image diff. Bug: 346873717 Change-Id: Ic867ce1eb3f415976d37d91a201ebac0b45f0f1e Test: aosp_cf_x86_64_phone build succeeded Ignore-AOSP-First: Internal only feature (cherry picked from commit 7d04b4d978de0045e46ec51e75177596abb05c08) --- tools/filelistdiff/allowlist | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/filelistdiff/allowlist b/tools/filelistdiff/allowlist index 943f9559f3..72c12a0f54 100644 --- a/tools/filelistdiff/allowlist +++ b/tools/filelistdiff/allowlist @@ -84,4 +84,16 @@ init.environ.rc # Known diffs only in the Soong system image lib/libhidcommand_jni.so -lib/libuinputcommand_jni.so \ No newline at end of file +lib/libuinputcommand_jni.so + +# Known diffs in internal source +bin/uprobestats +etc/aconfig/flag.map +etc/aconfig/flag.val +etc/aconfig/package.map +etc/bpf/uprobestats/BitmapAllocation.o +etc/bpf/uprobestats/GenericInstrumentation.o +etc/init/UprobeStats.rc +lib/libuprobestats_client.so +lib64/libuprobestats_client.so +priv-app/DeviceDiagnostics/DeviceDiagnostics.apk \ No newline at end of file From 161520fca4de422e02cc3fd87a2a6349b64fcb29 Mon Sep 17 00:00:00 2001 From: Sid Nayyar Date: Fri, 19 Jul 2024 14:26:16 +0000 Subject: [PATCH 2/2] Add kernel lifetimes and approved OGKI builds configs to GSI These kernel configs are required for end-of-life enforcement and OGKI compliance verification VTS tests. Bug: 338636324 Bug: 342094847 Test: manually built and flashed on device, device had config files (cherry picked from https://android-review.googlesource.com/q/commit:0123e4d62687683f6cfee115f1065af19869a239) Merged-In: Ia1f94ba19bab1f2e3b129827ad5634023290dbc5 Change-Id: Ia1f94ba19bab1f2e3b129827ad5634023290dbc5 --- target/product/base_system.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index d8b34f11e9..9a6746fc80 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -443,6 +443,11 @@ PRODUCT_VENDOR_PROPERTIES += ro.zygote?=zygote32 PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0 PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1 +# Include kernel configs. +PRODUCT_PACKAGES += \ + approved-ogki-builds.xml \ + kernel-lifetimes.xml + # Packages included only for eng or userdebug builds, previously debug tagged PRODUCT_PACKAGES_DEBUG := \ adb_keys \