Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb84af4f authored Mar 23, 2024 by Treehugger Robot Committed by Automerger Merge Worker Mar 23, 2024

Merge "Move the dependency on protolog.conf.json.gz to services" into main am: 505e763e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3001610

Change-Id: Ied6663865ee90bd38a11144973fd25e6a31bb00b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 05a80f21 505e763e

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

services/Android.bp

+1 −0

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

		required: [
		"libukey2_jni_shared",
		"protolog.conf.json.gz",
		],

		// Uncomment to enable output of certain warnings (deprecated, unchecked)