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

Commit d77db87a authored Sep 08, 2022 by Mårten Kongstad Committed by Automerger Merge Worker Sep 08, 2022

Merge "Update droidstubs to use the SdkExt info file" am: 3312d073 am: 74c2f2ab am: d7e5f37d

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

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

parents dabb706d d7e5f37d

ApiDocs.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,7 @@ droidstubs {
		"api-versions-jars-dir",
		],
		api_levels_sdk_type: "system",
		extensions_info_file: ":sdk-extensions-info",
		}

		droidstubs {
		@@ -146,6 +147,7 @@ droidstubs {
		"packages/modules/Media/apex/aidl/stable",
		],
		},
		extensions_info_file: ":sdk-extensions-info",
		}

		/////////////////////////////////////////////////////////////////////

StubLibraries.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -420,6 +420,7 @@ droidstubs {
		"sdk-dir",
		"api-versions-jars-dir",
		],
		extensions_info_file: ":sdk-extensions-info",
		}

		droidstubs {
		@@ -432,6 +433,7 @@ droidstubs {
		"api-versions-jars-dir",
		],
		api_levels_sdk_type: "system",
		extensions_info_file: ":sdk-extensions-info",
		}

		/////////////////////////////////////////////////////////////////////