diff options
| author | Jiyong Park <jiyong@google.com> | 2019-08-19 15:24:49 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-08-29 07:44:38 +0900 |
| commit | 20426538f85098552f52dffb40d0f7ffff7946d4 (patch) | |
| tree | cbd17d4b300a8fff9323f39664f3a69f216ae65b /location/lib | |
| parent | d2411f730f6d143d00b605312e632d0e41d9f632 (diff) | |
Cut the dependency to framework from droiddoc modules
droiddoc modules for the SDK API documentation and stubs library
generations have depended on the 'framework' (which was recently changed
to framework-minus-apex' module to get the list of Java source files to
be processed.
This however caused a circular dependency when we tried to modularize
some classes in the framework library as a separate library. The
separate java library depended on the stubs library (because it should
only use SDK APIs) and the stubs library depended on the framework
library. The framework library itself depended on the separated library
(or its stub) to use APIs from the separated library, thus forming a
circular dependency.
This change fixes the problem by directly giving the framework source
files via a filegroup `framework-sources-to-document` where all Java
and AIDL files that are to be documented are included in.
This change also put the generated R.java and Manifest.java files from
framework-res into the filegroup for framework sources.
Bug: 70046217
Bug: 135922046
Test: m
Change-Id: I09ad88da47540d31ad089aad5e1151a4b6877ec2
Diffstat (limited to 'location/lib')
| -rw-r--r-- | location/lib/Android.bp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/location/lib/Android.bp b/location/lib/Android.bp index b15cc5ccd656..ff6921d3e1c2 100644 --- a/location/lib/Android.bp +++ b/location/lib/Android.bp @@ -16,13 +16,12 @@ java_sdk_library { name: "com.android.location.provider", - srcs: ["java/**/*.java"], + srcs: [ + "java/**/*.java", + ":framework-srcs", + ], libs: [ "androidx.annotation_annotation", ], api_packages: ["com.android.location.provider"], - srcs_lib: "framework-minus-apex", - // TODO(b/70046217): remove core/java and android below. It was added to provide definitions for - // types like android.os.Bundle - srcs_lib_whitelist_pkgs: ["android", "com.android.internal.location"], } |