diff options
| author | Jiyong Park <jiyong@google.com> | 2019-08-07 22:45:07 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-08-20 14:06:03 +0900 |
| commit | 0c6dc7b7098ac17edcb9a9661854d8cf8563508b (patch) | |
| tree | cfcae03bfcb5b7d5de7712e5a1dbc8aec0665f64 /location/lib | |
| parent | 77e183ba6e71903c2c01ff8e736aeef19df11122 (diff) | |
glob pattern is used for AIDL files under frameworks/base
This change removes the manullay curated list of AIDL files and replace
them with globs.
In addition, framework-aidl-mappings no longer sets frameworks-defaults
to its src property, but instead uses the several variables like
framework_srcs, framework_aidl_local_include_dirs, etc. to get the
same files/dirs list as the framework.
The variables will eventually be replaced with filegroups when aidl
include paths are better handled (i.e. 'path' property of all filegroups
for a module contributes to the AIDL include paths for all AIDL files in
the module).
Bug: 70046217
Test: m
Merged-In: I59728ed06d66d44bc19bcd8530042c01add5fc2b
(cherry picked from commit 1cc9566ee26ff2e4ef9d738062409e868a21e34f)
Change-Id: I59728ed06d66d44bc19bcd8530042c01add5fc2b
Diffstat (limited to 'location/lib')
| -rw-r--r-- | location/lib/Android.bp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/location/lib/Android.bp b/location/lib/Android.bp index 35f287737d17..59963dea0ab9 100644 --- a/location/lib/Android.bp +++ b/location/lib/Android.bp @@ -19,6 +19,8 @@ java_sdk_library { srcs: ["java/**/*.java"], api_packages: ["com.android.location.provider"], srcs_lib: "framework", - srcs_lib_whitelist_dirs: ["location/java"], - srcs_lib_whitelist_pkgs: ["com.android.internal.location"], + // TODO(b/70046217): remove core/java and android below. It was added to provide definitions for + // types like android.os.Bundle + srcs_lib_whitelist_dirs: ["core/java", "location/java"], + srcs_lib_whitelist_pkgs: ["android", "com.android.internal.location"], } |