summaryrefslogtreecommitdiff
path: root/location/lib/Android.bp
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2019-08-07 22:45:07 +0900
committer Jiyong Park <jiyong@google.com> 2019-08-20 13:26:49 +0900
commit90625f10f8ad4716d59b3d0aa9a6eef62265dac1 (patch)
tree57337c7cc1a459bfb2cc169c733cd9b28e6d01b7 /location/lib/Android.bp
parent3878f501077599420c4f1b464ed6695c7157d9f0 (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/Android.bp')
-rw-r--r--location/lib/Android.bp6
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"],
}