commit 51bf3fd50340507f4b34d222d0bda90d5d7e0bb5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 10 19:30:01 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 10 19:30:01 2023 +0000
tree 99f289e0ed1a9037f5dee2fc180151d8c0b77f0a
parent ef9965e2bc6c4ba46534192d215c58a8c9837776
parent dde5ebaa583af372926e75a4ac495e7c78691cc1

Merge "Fix Rsa-Oaep operation begin on T+GSI build" into main

libs/WindowManager/Shell/Android.bp

diff --git a/libs/WindowManager/Shell/Android.bp b/libs/WindowManager/Shell/Android.bp
index b3108fe..66b02ef 100644
--- a/libs/WindowManager/Shell/Android.bp
+++ b/libs/WindowManager/Shell/Android.bp
@@ -110,8 +110,7 @@
     name: "protolog.json.gz",
     srcs: [":generate-wm_shell_protolog.json"],
     out: ["wmshell.protolog.json.gz"],
-    cmd: "$(location minigzip) -c < $(in) > $(out)",
-    tools: ["minigzip"],
+    cmd: "gzip -c < $(in) > $(out)",
 }
 
 prebuilt_etc {

services/core/Android.bp

diff --git a/services/core/Android.bp b/services/core/Android.bp
index 81f600e..e687aa9 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -215,8 +215,7 @@
     name: "services.core.json.gz",
     srcs: [":checked-protolog.json"],
     out: ["services.core.protolog.json.gz"],
-    cmd: "$(location minigzip) -c < $(in) > $(out)",
-    tools: ["minigzip"],
+    cmd: "gzip -c < $(in) > $(out)",
 }
 
 prebuilt_etc {