diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index bef32513d18b..6fc233c94310 100644 --- a/Android.bp +++ b/Android.bp @@ -244,8 +244,9 @@ java_defaults { }, required: [ - // TODO: remove gps_debug when the build system propagates "required" properly. + // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly. "gps_debug.conf", + "protolog.conf.json.gz", ], } @@ -899,8 +900,10 @@ metalava_framework_docs_args += " --replace-documentation " + packages_to_document = [ "android", + "dalvik", "java", "javax", + "junit", "org.apache.http", "org.json", "org.w3c.dom", @@ -931,7 +934,7 @@ stubs_defaults { "sdk-dir", "api-versions-jars-dir", ], - previous_api: ":last-released-public-api", + previous_api: ":last-released-public-api-for-metalava-annotations", merge_annotations_dirs: [ "metalava-manual", "ojluni-annotated-sdk-stubs", @@ -988,7 +991,7 @@ stubs_defaults { local_sourcepaths: frameworks_base_subdirs, installable: false, annotations_enabled: true, - previous_api: ":last-released-public-api", + previous_api: ":last-released-public-api-for-metalava-annotations", merge_annotations_dirs: [ "metalava-manual", "ojluni-annotated-sdk-stubs", @@ -1324,7 +1327,7 @@ droidstubs { installable: false, sdk_version: "core_platform", annotations_enabled: true, - previous_api: ":last-released-public-api", + previous_api: ":last-released-public-api-for-metalava-annotations", merge_annotations_dirs: [ "metalava-manual", "ojluni-annotated-sdk-stubs", |