From a03d0c829d5eda2d560792fb127e0ba0e17fc9c6 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Tue, 5 Mar 2024 00:55:40 +0000 Subject: [PATCH 1/3] Revert "Add betterbug folder to gs-common" Revert submission 26348985-bb-sepolicy-poc Reason for revert: Droidfood blocking bug: b/327991669 Bug: b/327991669 Reverted changes: /q/submissionid:26348985-bb-sepolicy-poc (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aca06d61c64f947252808f73fbe01fdda5109c0e) Merged-In: I0fe0bb22e293093d941b4d8ba826c8c8689a370d Change-Id: I0fe0bb22e293093d941b4d8ba826c8c8689a370d --- betterbug/betterbug.mk | 5 ----- .../sepolicy/product/private/better_bug_app.te | 15 --------------- betterbug/sepolicy/product/private/seapp_contexts | 2 -- .../sepolicy/product/public/better_bug_app.te | 1 - 4 files changed, 23 deletions(-) delete mode 100644 betterbug/betterbug.mk delete mode 100644 betterbug/sepolicy/product/private/better_bug_app.te delete mode 100644 betterbug/sepolicy/product/private/seapp_contexts delete mode 100644 betterbug/sepolicy/product/public/better_bug_app.te diff --git a/betterbug/betterbug.mk b/betterbug/betterbug.mk deleted file mode 100644 index f3ae647..0000000 --- a/betterbug/betterbug.mk +++ /dev/null @@ -1,5 +0,0 @@ -PRODUCT_PACKAGES += BetterBugStub -PRODUCT_PACKAGES_DEBUG += BetterBug - -PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/betterbug/sepolicy/product/public -PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/betterbug/sepolicy/product/private diff --git a/betterbug/sepolicy/product/private/better_bug_app.te b/betterbug/sepolicy/product/private/better_bug_app.te deleted file mode 100644 index bb50612..0000000 --- a/betterbug/sepolicy/product/private/better_bug_app.te +++ /dev/null @@ -1,15 +0,0 @@ -typeattribute better_bug_app coredomain; - -app_domain(better_bug_app) -net_domain(better_bug_app) - -allow better_bug_app shell_data_file:file read; -allow better_bug_app privapp_data_file:file execute; - -allow better_bug_app app_api_service:service_manager find; -allow better_bug_app system_api_service:service_manager find; -allow better_bug_app mediaserver_service:service_manager find; - -set_prop(better_bug_app, ctl_start_prop) - -get_prop(better_bug_app, system_boot_reason_prop) diff --git a/betterbug/sepolicy/product/private/seapp_contexts b/betterbug/sepolicy/product/private/seapp_contexts deleted file mode 100644 index 261e710..0000000 --- a/betterbug/sepolicy/product/private/seapp_contexts +++ /dev/null @@ -1,2 +0,0 @@ -# BetterBug -user=_app isPrivApp=true name=com.google.android.apps.internal.betterbug domain=better_bug_app type=app_data_file levelFrom=all diff --git a/betterbug/sepolicy/product/public/better_bug_app.te b/betterbug/sepolicy/product/public/better_bug_app.te deleted file mode 100644 index 9a14782..0000000 --- a/betterbug/sepolicy/product/public/better_bug_app.te +++ /dev/null @@ -1 +0,0 @@ -type better_bug_app, domain; From 0e3f3c1d885041477bdcf01df2db2f4ec15d6075 Mon Sep 17 00:00:00 2001 From: Klines Jiang Date: Mon, 25 Mar 2024 08:58:41 +0000 Subject: [PATCH 2/3] [Gyotaku] Update the build rule to exclude build Gyotaku dump for barbet Pixel 5a (barbet) does not support Pixel dump, we need to exclude build Pixel dump for Pixel 5a (barbet). The git_24Q2-beta-release TARGET_PRODUCT is barbet_beta, updated to barbet% for all barbet target products. Bug: 330819191 Test: Local build and trigger a new build the result passed (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d4de4ddf902f75ebcb6b0e1079e78b8a96410ed5) Merged-In: I2c1785105bab74a483bc68893d96a8a88eabfd90 Change-Id: I2c1785105bab74a483bc68893d96a8a88eabfd90 --- gyotaku_app/gyotaku.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gyotaku_app/gyotaku.mk b/gyotaku_app/gyotaku.mk index c6c41d5..8a6bb10 100644 --- a/gyotaku_app/gyotaku.mk +++ b/gyotaku_app/gyotaku.mk @@ -6,7 +6,7 @@ ifneq ($(TARGET_BUILD_VARIANT), user) BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/sepolicy/ # Pixel 5a (barbet) does not support Pixel dump - ifneq ($(TARGET_PRODUCT), barbet) + ifeq (,$(filter barbet%,$(TARGET_PRODUCT))) PRODUCT_PACKAGES_DEBUG += dump_gyotaku BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/dump endif From 5f01cd2856f5015c3c4946d54598eda6b1cc63a1 Mon Sep 17 00:00:00 2001 From: Klines Jiang Date: Thu, 30 May 2024 06:09:31 +0000 Subject: [PATCH 3/3] [dump_gyotaku] Add collect odpm logs for dump_gyotaku. Bug: 328551786 Test: Local build and odpm logs collected test passed. Change-Id: Ic0071e8ee2262c3fa439444a6b90f092749afe43 --- gyotaku_app/dump/dump_gyotaku.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gyotaku_app/dump/dump_gyotaku.cpp b/gyotaku_app/dump/dump_gyotaku.cpp index 62c2a57..0f22e68 100644 --- a/gyotaku_app/dump/dump_gyotaku.cpp +++ b/gyotaku_app/dump/dump_gyotaku.cpp @@ -19,7 +19,7 @@ #define GYOTAKU_DIRECTORY "/data/vendor/gyotaku/andlog" #define GYOTAKU_ANDROID_LOG_PREFIX "android_" - +#define GYOTAKU_ODPM_LOG_PREFIX "odpm_" #define maxFileLogsNumber 30 int main() { @@ -30,6 +30,7 @@ int main() { } dumpLogs(GYOTAKU_DIRECTORY, outputDir.c_str(), maxFileLogsNumber, GYOTAKU_ANDROID_LOG_PREFIX); + dumpLogs(GYOTAKU_DIRECTORY, outputDir.c_str(), maxFileLogsNumber, GYOTAKU_ODPM_LOG_PREFIX); return 0; }