From 2bb3da4f50f97fb78f75adc69cfc40c3aa968845 Mon Sep 17 00:00:00 2001 From: Klines Jiang Date: Tue, 23 Jan 2024 07:07:44 +0000 Subject: [PATCH 1/4] [Gyotaku] Add the dumpLog for gyotaku app Bug: 310110649 Test: Local build and trigger a new bugreport the result passed Change-Id: If10d4ab9120d855c5d1396413d8acfe791c05e6c --- gyotaku_app/dump/Android.bp | 20 ++++++++++++++++ gyotaku_app/dump/dump_gyotaku.cpp | 35 ++++++++++++++++++++++++++++ gyotaku_app/gyotaku.mk | 3 ++- gyotaku_app/sepolicy/dump_gyotaku.te | 11 +++++++++ gyotaku_app/sepolicy/file.te | 5 ++++ gyotaku_app/sepolicy/file_contexts | 4 ++++ 6 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 gyotaku_app/dump/Android.bp create mode 100644 gyotaku_app/dump/dump_gyotaku.cpp create mode 100644 gyotaku_app/sepolicy/dump_gyotaku.te create mode 100644 gyotaku_app/sepolicy/file.te create mode 100644 gyotaku_app/sepolicy/file_contexts diff --git a/gyotaku_app/dump/Android.bp b/gyotaku_app/dump/Android.bp new file mode 100644 index 0000000..0f62d0a --- /dev/null +++ b/gyotaku_app/dump/Android.bp @@ -0,0 +1,20 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +cc_binary { + name: "dump_gyotaku", + srcs: ["dump_gyotaku.cpp"], + cflags: [ + "-Wall", + "-Wextra", + "-Werror", + ], + shared_libs: [ + "libbase", + "libdump", + "liblog", + ], + vendor: true, + relative_install_path: "dump", +} diff --git a/gyotaku_app/dump/dump_gyotaku.cpp b/gyotaku_app/dump/dump_gyotaku.cpp new file mode 100644 index 0000000..62c2a57 --- /dev/null +++ b/gyotaku_app/dump/dump_gyotaku.cpp @@ -0,0 +1,35 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include +#include + +#define GYOTAKU_DIRECTORY "/data/vendor/gyotaku/andlog" +#define GYOTAKU_ANDROID_LOG_PREFIX "android_" + +#define maxFileLogsNumber 30 + +int main() { + std::string outputDir = concatenatePath(BUGREPORT_PACKING_DIR, "gyotaku"); + if (mkdir(outputDir.c_str(), 0700) == -1) { + printf("Unable to create folder: %s\n", outputDir.c_str()); + return 0; + } + + dumpLogs(GYOTAKU_DIRECTORY, outputDir.c_str(), maxFileLogsNumber, GYOTAKU_ANDROID_LOG_PREFIX); + return 0; +} + diff --git a/gyotaku_app/gyotaku.mk b/gyotaku_app/gyotaku.mk index fa58556..53591dd 100644 --- a/gyotaku_app/gyotaku.mk +++ b/gyotaku_app/gyotaku.mk @@ -1,7 +1,8 @@ ifneq ($(TARGET_BUILD_VARIANT), user) ifeq (,$(filter aosp_%, $(TARGET_PRODUCT))) # Skip aosp target product PRODUCT_PACKAGES_DEBUG += \ - Gyotaku + Gyotaku \ + dump_gyotaku BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/sepolicy/ endif diff --git a/gyotaku_app/sepolicy/dump_gyotaku.te b/gyotaku_app/sepolicy/dump_gyotaku.te new file mode 100644 index 0000000..8c1727f --- /dev/null +++ b/gyotaku_app/sepolicy/dump_gyotaku.te @@ -0,0 +1,11 @@ +pixel_bugreport(dump_gyotaku) + +userdebug_or_eng(` + # For access and collecting logs into vendor radio type folder. + allow dump_gyotaku radio_vendor_data_file:dir create_dir_perms; + allow dump_gyotaku radio_vendor_data_file:file create_file_perms; + + # For access /data/vendor/ folder. + allow dump_gyotaku gyotaku_vendor_data_file:dir create_dir_perms; + allow dump_gyotaku gyotaku_vendor_data_file:file create_file_perms; +') diff --git a/gyotaku_app/sepolicy/file.te b/gyotaku_app/sepolicy/file.te new file mode 100644 index 0000000..8035955 --- /dev/null +++ b/gyotaku_app/sepolicy/file.te @@ -0,0 +1,5 @@ +# For /data/vendor use +type gyotaku_vendor_data_file, file_type, data_file_type; +userdebug_or_eng(` + typeattribute gyotaku_vendor_data_file mlstrustedobject; +') diff --git a/gyotaku_app/sepolicy/file_contexts b/gyotaku_app/sepolicy/file_contexts new file mode 100644 index 0000000..3a16a00 --- /dev/null +++ b/gyotaku_app/sepolicy/file_contexts @@ -0,0 +1,4 @@ +/data/vendor/gyotaku(/.*)? u:object_r:gyotaku_vendor_data_file:s0 + +# Pixel dump for Gyotaku +/vendor/bin/dump/dump_gyotaku u:object_r:dump_gyotaku_exec:s0 From 1ac691dcaeecfa42be07564466a7da98d2867577 Mon Sep 17 00:00:00 2001 From: Hongbo Zeng Date: Thu, 25 Jan 2024 11:58:43 +0800 Subject: [PATCH 2/4] include adum_log/adum_log_old in dumpstate_board.bin Bug: 322266425 Test: Capture bugreport and see if adum_log/adum_log_old are included in dumpsate_board.bin or not Change-Id: If9b8bbd98c699719878034859321ec54c0ced35b --- radio/dump_radio.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/radio/dump_radio.cpp b/radio/dump_radio.cpp index 8d6743c..3ee90f0 100644 --- a/radio/dump_radio.cpp +++ b/radio/dump_radio.cpp @@ -34,6 +34,8 @@ int main() { if (tcpdumpEnabled) { dumpLogs(TCPDUMP_LOG_DIRECTORY, BUGREPORT_PACKING_DIR, ::android::base::GetIntProperty(TCPDUMP_NUMBER_BUGREPORT, 5), TCPDUMP_LOG_PREFIX); } + copyFile("/data/vendor/radio/adum_log", "/data/vendor/radio/logs/always-on/all_logs/adum_log"); + copyFile("/data/vendor/radio/adum_log_old", "/data/vendor/radio/logs/always-on/all_logs/adum_log_old"); copyFile("/data/vendor/radio/metrics_data", "/data/vendor/radio/logs/always-on/all_logs/metrics_data"); copyFile("/data/vendor/radio/omadm_logs.txt", "/data/vendor/radio/logs/always-on/all_logs/omadm_logs.txt"); copyFile("/data/vendor/radio/power_anomaly_data.txt", "/data/vendor/radio/logs/always-on/all_logs/power_anomaly_data.txt"); From d888b4a3be984bbcf6a1ca9281cb2c202982c92d Mon Sep 17 00:00:00 2001 From: Lilian Wang Date: Mon, 5 Feb 2024 02:28:08 +0000 Subject: [PATCH 3/4] Revert "[Gyotaku] Add the dumpLog for gyotaku app" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2bb3da4f50f97fb78f75adc69cfc40c3aa968845. Reason for revert: “DroidMonitor: Potential culprit for Bug b/323767330 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted."build error in Bug: 323767330 Change-Id: If23de50de2819449817fe3b1694db33d87448e28 --- gyotaku_app/dump/Android.bp | 20 ---------------- gyotaku_app/dump/dump_gyotaku.cpp | 35 ---------------------------- gyotaku_app/gyotaku.mk | 3 +-- gyotaku_app/sepolicy/dump_gyotaku.te | 11 --------- gyotaku_app/sepolicy/file.te | 5 ---- gyotaku_app/sepolicy/file_contexts | 4 ---- 6 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 gyotaku_app/dump/Android.bp delete mode 100644 gyotaku_app/dump/dump_gyotaku.cpp delete mode 100644 gyotaku_app/sepolicy/dump_gyotaku.te delete mode 100644 gyotaku_app/sepolicy/file.te delete mode 100644 gyotaku_app/sepolicy/file_contexts diff --git a/gyotaku_app/dump/Android.bp b/gyotaku_app/dump/Android.bp deleted file mode 100644 index 0f62d0a..0000000 --- a/gyotaku_app/dump/Android.bp +++ /dev/null @@ -1,20 +0,0 @@ -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -cc_binary { - name: "dump_gyotaku", - srcs: ["dump_gyotaku.cpp"], - cflags: [ - "-Wall", - "-Wextra", - "-Werror", - ], - shared_libs: [ - "libbase", - "libdump", - "liblog", - ], - vendor: true, - relative_install_path: "dump", -} diff --git a/gyotaku_app/dump/dump_gyotaku.cpp b/gyotaku_app/dump/dump_gyotaku.cpp deleted file mode 100644 index 62c2a57..0000000 --- a/gyotaku_app/dump/dump_gyotaku.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include -#include -#include - -#define GYOTAKU_DIRECTORY "/data/vendor/gyotaku/andlog" -#define GYOTAKU_ANDROID_LOG_PREFIX "android_" - -#define maxFileLogsNumber 30 - -int main() { - std::string outputDir = concatenatePath(BUGREPORT_PACKING_DIR, "gyotaku"); - if (mkdir(outputDir.c_str(), 0700) == -1) { - printf("Unable to create folder: %s\n", outputDir.c_str()); - return 0; - } - - dumpLogs(GYOTAKU_DIRECTORY, outputDir.c_str(), maxFileLogsNumber, GYOTAKU_ANDROID_LOG_PREFIX); - return 0; -} - diff --git a/gyotaku_app/gyotaku.mk b/gyotaku_app/gyotaku.mk index 53591dd..fa58556 100644 --- a/gyotaku_app/gyotaku.mk +++ b/gyotaku_app/gyotaku.mk @@ -1,8 +1,7 @@ ifneq ($(TARGET_BUILD_VARIANT), user) ifeq (,$(filter aosp_%, $(TARGET_PRODUCT))) # Skip aosp target product PRODUCT_PACKAGES_DEBUG += \ - Gyotaku \ - dump_gyotaku + Gyotaku BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/sepolicy/ endif diff --git a/gyotaku_app/sepolicy/dump_gyotaku.te b/gyotaku_app/sepolicy/dump_gyotaku.te deleted file mode 100644 index 8c1727f..0000000 --- a/gyotaku_app/sepolicy/dump_gyotaku.te +++ /dev/null @@ -1,11 +0,0 @@ -pixel_bugreport(dump_gyotaku) - -userdebug_or_eng(` - # For access and collecting logs into vendor radio type folder. - allow dump_gyotaku radio_vendor_data_file:dir create_dir_perms; - allow dump_gyotaku radio_vendor_data_file:file create_file_perms; - - # For access /data/vendor/ folder. - allow dump_gyotaku gyotaku_vendor_data_file:dir create_dir_perms; - allow dump_gyotaku gyotaku_vendor_data_file:file create_file_perms; -') diff --git a/gyotaku_app/sepolicy/file.te b/gyotaku_app/sepolicy/file.te deleted file mode 100644 index 8035955..0000000 --- a/gyotaku_app/sepolicy/file.te +++ /dev/null @@ -1,5 +0,0 @@ -# For /data/vendor use -type gyotaku_vendor_data_file, file_type, data_file_type; -userdebug_or_eng(` - typeattribute gyotaku_vendor_data_file mlstrustedobject; -') diff --git a/gyotaku_app/sepolicy/file_contexts b/gyotaku_app/sepolicy/file_contexts deleted file mode 100644 index 3a16a00..0000000 --- a/gyotaku_app/sepolicy/file_contexts +++ /dev/null @@ -1,4 +0,0 @@ -/data/vendor/gyotaku(/.*)? u:object_r:gyotaku_vendor_data_file:s0 - -# Pixel dump for Gyotaku -/vendor/bin/dump/dump_gyotaku u:object_r:dump_gyotaku_exec:s0 From ddcf9b45e92ad9c2635208662d03fe99f638d6d8 Mon Sep 17 00:00:00 2001 From: Tommy Chiu Date: Wed, 31 Jan 2024 22:51:46 +0800 Subject: [PATCH 4/4] Add nugget_aidl_test_weaver to userdebug/eng builds To minimize the steps required for device preparation. Fixed: 320200171 Test: build pass Change-Id: I271389b0c4a7fe453902db2e8971e881c72bca35 --- dauntless/gsc.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dauntless/gsc.mk b/dauntless/gsc.mk index 892f71a..0c4985f 100644 --- a/dauntless/gsc.mk +++ b/dauntless/gsc.mk @@ -19,5 +19,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES_DEBUG += citadel_integration_tests \ pwntest \ nugget_targeted_tests \ - CitadelProvision -endif \ No newline at end of file + CitadelProvision \ + nugget_aidl_test_weaver +endif