From d888b4a3be984bbcf6a1ca9281cb2c202982c92d Mon Sep 17 00:00:00 2001
From: Lilian Wang <lilianw@google.com>
Date: Mon, 5 Feb 2024 02:28:08 +0000
Subject: [PATCH] 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 <unistd.h>
-#include <dump/pixel_dump.h>
-#include <android-base/file.h>
-
-#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