From 5863d8a8693b4e09d5ec767129212e35ad6e6765 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 18 Mar 2024 18:05:15 +0900
Subject: [PATCH] Move the dependency on protolog.conf.json.gz to services
The dependency is a "required" dependency, so it's not used for building
framework-minus-apex. We just want that protolog.conf.json.gz is
installed along with framework-minus-apex.
This CL moves the source of the dependency from framework-minus-apex to
services for two reasons:
1. There's a dependency cycle:
checked-protolog.json
-> generate-protolog.json
-> protolog-groups
-> framework
-> framework-minus-apex
-> protolog.conf.json.gz
-> services.core.json.gz
-> checked-protolog.json
Currently, this cycle is harmless because the installation of required
modules is done by Make and Make is not checking cycles there. However,
this is preventing Soong from implementing the installation of required
modules by itself.
2. services don't have such a dependency cycle, while
framework-minus-apex and services are installed together.
Bug: 321626681
Test: check the existence of /system/etc/protolog.conf.json.gz in
installed-files.txt
Merged-In: Iefdd457e99fc61c1ce2f5a05ae59f5e12256a764
Change-Id: Iefdd457e99fc61c1ce2f5a05ae59f5e12256a764
---
Android.bp | 1 -
services/Android.bp | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/Android.bp b/Android.bp
index 80469d649649..900fba03daa7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -386,7 +386,6 @@ java_defaults {
// 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
diff --git a/services/Android.bp b/services/Android.bp
index 5cb8ec628c38..474d501bca7a 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -219,6 +219,7 @@ java_library {
required: [
"libukey2_jni_shared",
+ "protolog.conf.json.gz",
],
// Uncomment to enable output of certain warnings (deprecated, unchecked)
--
GitLab