Move the dependency on core.protolog.pb to services
This is the same as Iefdd457e99fc61c1ce2f5a05ae59f5e12256a764 where we
moved the dependency on protolog.conf.json.gz to services.
core.protolog.pb has is causing a dependency cycle reported as below:
error: frameworks/base/services/core/Android.bp:111:1: encountered dependency cycle:
error: frameworks/base/services/core/Android.bp:311:1: module "core.protolog.pb" variant "android_x86_64" depends on module "checked-core.protolog.pb"
error: frameworks/base/services/core/Android.bp:111:1: module "checked-core.protolog.pb" depends on module "gen-core.protolog.pb"
error: frameworks/base/services/core/Android.bp:78:1: module "gen-core.protolog.pb" depends on module "protolog-groups" variant "android_common"
error: frameworks/base/core/java/Android.bp:589:1: module "protolog-groups" variant "android_common" depends on module "framework" variant "android_common"
error: frameworks/base/Android.bp:542:1: module "framework" variant "android_common" depends on module "framework-minus-apex" variant "android_common"
error: frameworks/base/Android.bp:486:1: module "framework-minus-apex" variant "android_common" depends on module "core.protolog.pb" variant "android_x86_64"
Bug: 321626681
Test: check the existence of /system/etc/core.protolog.pb in installed-files.txt
Change-Id: I502eee9e184bcf5fa3e5443cc3c124828ed565ad
diff --git a/Android.bp b/Android.bp
index 59e903e..f6bfe65 100644
--- a/Android.bp
+++ b/Android.bp
@@ -389,7 +389,6 @@
// TODO(b/120066492): remove gps_debug and protolog.conf.json when the build
// system propagates "required" properly.
"gps_debug.conf",
- "core.protolog.pb",
"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 7bbb42e..29d1acf 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -254,6 +254,7 @@
required: [
"libukey2_jni_shared",
"protolog.conf.json.gz",
+ "core.protolog.pb",
],
lint: {
baseline_filename: "lint-baseline.xml",