commit 505e763ee88d57a11b2d34ba7a5df48fe341d7ce
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Mar 23 00:05:46 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 23 00:05:46 2024 +0000
tree 184d5a79dfc115d8e6c3d37c237fd259108ca7fd
parent 7696104c135f5e2dd2f0c23ae677fe8b1212800d
parent 5863d8a8693b4e09d5ec767129212e35ad6e6765

Merge "Move the dependency on protolog.conf.json.gz to services" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index 80469d6..900fba0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -386,7 +386,6 @@
         // TODO(b/120066492): remove gps_debug and protolog.conf.json when the build
         // system propagates "required" properly.
         "gps_debug.conf",
-        "protolog.conf.json.gz",
         "framework-res",
         // any install dependencies should go into framework-minus-apex-install-dependencies
         // rather than here to avoid bloating incremental build time

services/Android.bp

diff --git a/services/Android.bp b/services/Android.bp
index 5cb8ec6..474d501 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -219,6 +219,7 @@
 
     required: [
         "libukey2_jni_shared",
+        "protolog.conf.json.gz",
     ],
 
     // Uncomment to enable output of certain warnings (deprecated, unchecked)