diff options
| author | Jiyong Park <jiyong@google.com> | 2019-11-11 14:14:30 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-11-16 20:48:06 +0900 |
| commit | ced28d531dbfd786191895f8f9722a48c3e1d11f (patch) | |
| tree | 24649b7624faa0fba0222939792274834774a2f9 | |
| parent | b4852382faf1cddc16b362cbf43651c0520342f2 (diff) | |
remove framework_base_subdirs
Metalava no longer requires it at least for droidstubs in this
directory. Even when local_sourcepath is not set, the -sourcepath option
is set to the module directory (frameworks/base in this case), and
metalava tries to find package.html files under the directory to know if
a package is hidden or not.
Exempt-From-Owner-Approval: cherry-pick from internal
Bug: 144264106
Test: m
Merged-In: Idfa2aa392ae1da9582e7691a8c06c986baad5088
(cherry picked from commit e53786e864fd3f3097603ef9dfcfcb6b604ee7b1)
Change-Id: Idfa2aa392ae1da9582e7691a8c06c986baad5088
| -rw-r--r-- | Android.bp | 24 | ||||
| -rw-r--r-- | core/java/com/android/internal/package-info.java | 4 |
2 files changed, 4 insertions, 24 deletions
diff --git a/Android.bp b/Android.bp index 891ee91f7ed9..543e65601517 100644 --- a/Android.bp +++ b/Android.bp @@ -865,28 +865,6 @@ python_binary_host { ], } -// TODO: Don't rely on this list by switching package.html into package-info.java -frameworks_base_subdirs = [ - "core/java", - "graphics/java", - "location/java", - "media/java", - "media/mca/effect/java", - "media/mca/filterfw/java", - "media/mca/filterpacks/java", - "drm/java", - "mms/java", - "opengl/java", - "sax/java", - "telecomm/java", - "telephony/common", - "telephony/java", - "wifi/java", - "lowpan/java", - "keystore/java", - "rs/java", -] - // Make the api/current.txt file available for use by modules in other // directories. filegroup { @@ -998,7 +976,6 @@ stubs_defaults { "test-runner/src/**/*.java", ], libs: framework_docs_only_libs, - local_sourcepaths: frameworks_base_subdirs, create_doc_stubs: true, annotations_enabled: true, api_levels_annotations_enabled: true, @@ -1059,7 +1036,6 @@ stubs_defaults { ":updatable-media-srcs", ], libs: ["framework-internal-utils"], - local_sourcepaths: frameworks_base_subdirs, installable: false, annotations_enabled: true, previous_api: ":last-released-public-api", diff --git a/core/java/com/android/internal/package-info.java b/core/java/com/android/internal/package-info.java new file mode 100644 index 000000000000..8a226dbdc9fe --- /dev/null +++ b/core/java/com/android/internal/package-info.java @@ -0,0 +1,4 @@ +/** + * @hide + */ +package com.android.internal; |