diff options
| author | Jiyong Park <jiyong@google.com> | 2019-09-23 15:45:09 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-23 15:45:09 -0700 |
| commit | acac2c9174df2e25b5b99864b443435831d993e5 (patch) | |
| tree | d2601c61e96fe605ceef39f2f836613d86450e0b | |
| parent | 0b5b9a46398b4a97d60b8375e102b11b398a3d54 (diff) | |
| parent | 4de7f5eaac10a643569fe8448cc26c02b211b602 (diff) | |
Merge changes Iea1d2ae2,I1d3c8e48 am: d708ea7b4a am: ebde74e7b1 am: fd4c08b689
am: 4de7f5eaac
Change-Id: Icf780d431f0dd596eee4d07ed26f33f5e0819ed9
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | location/lib/Android.bp | 8 | ||||
| -rw-r--r-- | media/lib/signer/Android.bp | 7 | ||||
| -rw-r--r-- | test-mock/Android.bp | 7 |
4 files changed, 13 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp index 31dbaadfd332..d5fc957be543 100644 --- a/Android.bp +++ b/Android.bp @@ -899,8 +899,10 @@ metalava_framework_docs_args += " --replace-documentation " + packages_to_document = [ "android", + "dalvik", "java", "javax", + "junit", "org.apache.http", "org.json", "org.w3c.dom", diff --git a/location/lib/Android.bp b/location/lib/Android.bp index b36aa036daba..1daee5d953a3 100644 --- a/location/lib/Android.bp +++ b/location/lib/Android.bp @@ -16,9 +16,11 @@ java_sdk_library { name: "com.android.location.provider", - srcs: [ - "java/**/*.java", - ":framework-all-sources", + srcs: ["java/**/*.java"], + api_srcs: [":framework-all-sources"], + libs: [ + "androidx.annotation_annotation", + "framework-all", ], libs: [ "androidx.annotation_annotation", diff --git a/media/lib/signer/Android.bp b/media/lib/signer/Android.bp index 2286c5379e1a..6b03e4de57d7 100644 --- a/media/lib/signer/Android.bp +++ b/media/lib/signer/Android.bp @@ -16,9 +16,8 @@ java_sdk_library { name: "com.android.mediadrm.signer", - srcs: [ - "java/**/*.java", - ":framework-all-sources", - ], + srcs: ["java/**/*.java"], + api_srcs: [":framework-all-sources"], + libs: ["framework-all"], api_packages: ["com.android.mediadrm.signer"], } diff --git a/test-mock/Android.bp b/test-mock/Android.bp index adc9e2251c0b..81b1e49ffed1 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -19,10 +19,9 @@ java_sdk_library { name: "android.test.mock", - srcs: [ - "src/**/*.java", - ":framework-all-sources", - ], + srcs: ["src/**/*.java"], + api_srcs: [":framework-all-sources"], + libs: ["framework-all"], api_packages: [ "android.test.mock", |