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

Commit 529f9b89 authored May 10, 2023 by Anton Hansson Committed by Automerger Merge Worker May 10, 2023

Merge changes from topic "mvstub" am: ced0bbd1 am: 68e49ada am: b47fe3b8...

Merge changes from topic "mvstub" am: ced0bbd1 am: 68e49ada am: b47fe3b8 am: 86b7e6e7 am: ee351cee am: 64a1ad9d

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

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

parents d476761e 64a1ad9d

Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -698,8 +698,6 @@ stubs_defaults {
		}

		build = [
		"StubLibraries.bp",
		"ApiDocs.bp",
		"ProtoLibraries.bp",
		"TestProtoLibraries.bp",
		]

api/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -258,3 +258,8 @@ java_genrule {
		out: ["api_fingerprint.txt"],
		cmd: "cat $(in) \| md5sum \| cut -d' ' -f1 > $(out)",
		}

		build = [
		"ApiDocs.bp",
		"StubLibraries.bp",
		]

ApiDocs.bp→api/ApiDocs.bp

+0 −0

File moved.

StubLibraries.bp→api/StubLibraries.bp

+0 −0

File moved.

api/docs

0 → 120000

+1 −0

Original line number	Diff line number	Diff line
		../docs
		No newline at end of file