Merge "Include androidx stubs in framework docs" am: acd388baf2 am: 5c239c7e95

am: ecf64ba3c4

Change-Id: I8b7f2e1e303b7add21e8eee9fa16f29a14177d55
This commit is contained in:
Charles Munger
2019-11-20 09:58:51 -08:00
committed by android-build-merger

View File

@@ -949,7 +949,10 @@ framework_docs_only_args = " -android -manifest $(location core/res/AndroidManif
"-overview $(location core/java/overview.html) " +
// Federate Support Library references against local API file.
"-federate SupportLib https://developer.android.com " +
"-federationapi SupportLib $(location :current-support-api) "
"-federationapi SupportLib $(location :current-support-api) " +
// Federate Support Library references against local API file.
"-federate AndroidX https://developer.android.com " +
"-federationapi AndroidX $(location :current-androidx-api) "
framework_docs_only_libs = [
"voip-common",
@@ -1060,6 +1063,7 @@ doc_defaults {
"core/res/AndroidManifest.xml",
"core/java/overview.html",
":current-support-api",
":current-androidx-api",
],
create_stubs: false,
}