Commit 20d61794 authored Mar 18, 2024 by Jiyong Park

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

Change-Id: Iefdd457e99fc61c1ce2f5a05ae59f5e12256a764

parent e93875c6

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -389,7 +389,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",
		"core.protolog.pb",
		"framework-res",
		// any install dependencies should go into framework-minus-apex-install-dependencies

services/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -253,6 +253,7 @@ java_library {

		required: [
		"libukey2_jni_shared",
		"protolog.conf.json.gz",
		],
		lint: {
		baseline_filename: "lint-baseline.xml",