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

Commit 74c2f2ab 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

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

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

parents dc07ebea 3312d073

ApiDocs.bp

+2 −0

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

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

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

StubLibraries.bp

+2 −0

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

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

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