diff options
| author | Jiyong Park <jiyong@google.com> | 2019-08-16 21:17:14 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-08-26 08:09:49 +0000 |
| commit | d6be579720a6d457ee14a8b53ba1c659c5638838 (patch) | |
| tree | 820971929297de06b93337d7a31e4d1e624aa8a5 /packages/services | |
| parent | 9e4df4985a5bc6ffd8b30796e5c04d2013d26462 (diff) | |
Use filegroup to simplify Android.bp for frameworks and its friends
Java and AIDL source files under frameworks/base are now modularized
using filegroup. Each filegroup has 'path' property set to the base
directory of the ssource files. This allows us to not rely on
aidl.[local_]include_dirs and srcs_lib_whitelist_dirs to get the base
directories.
Bug: 70046217
Test: m
Exempt-From-Owner-Approval: Approved internally
Merged-In: I0705ddf76b3c628127f65d75e0a8b06c6c250fe2
(cherry picked from commit b360931bf0f2d011dada18762829c0d0e47c54b6)
Change-Id: I0705ddf76b3c628127f65d75e0a8b06c6c250fe2
Diffstat (limited to 'packages/services')
| -rw-r--r-- | packages/services/PacProcessor/Android.bp | 6 | ||||
| -rw-r--r-- | packages/services/PacProcessor/src/com/android/net/IProxyService.aidl (renamed from packages/services/PacProcessor/com/android/net/IProxyService.aidl) | 0 | ||||
| -rw-r--r-- | packages/services/Proxy/Android.bp | 6 | ||||
| -rw-r--r-- | packages/services/Proxy/src/com/android/net/IProxyCallback.aidl (renamed from packages/services/Proxy/com/android/net/IProxyCallback.aidl) | 0 | ||||
| -rw-r--r-- | packages/services/Proxy/src/com/android/net/IProxyPortListener.aidl (renamed from packages/services/Proxy/com/android/net/IProxyPortListener.aidl) | 0 |
5 files changed, 12 insertions, 0 deletions
diff --git a/packages/services/PacProcessor/Android.bp b/packages/services/PacProcessor/Android.bp index 93b2d956cf6f..494a8187886d 100644 --- a/packages/services/PacProcessor/Android.bp +++ b/packages/services/PacProcessor/Android.bp @@ -21,3 +21,9 @@ android_app { certificate: "platform", jni_libs: ["libjni_pacprocessor"], } + +filegroup { + name: "PacProcessor-aidl-sources", + srcs: ["src/**/*.aidl"], + path: "src", +} diff --git a/packages/services/PacProcessor/com/android/net/IProxyService.aidl b/packages/services/PacProcessor/src/com/android/net/IProxyService.aidl index 4e54aba5c3bf..4e54aba5c3bf 100644 --- a/packages/services/PacProcessor/com/android/net/IProxyService.aidl +++ b/packages/services/PacProcessor/src/com/android/net/IProxyService.aidl diff --git a/packages/services/Proxy/Android.bp b/packages/services/Proxy/Android.bp index 87aa7637df8e..d93c9f8d9941 100644 --- a/packages/services/Proxy/Android.bp +++ b/packages/services/Proxy/Android.bp @@ -5,3 +5,9 @@ android_app { certificate: "platform", privileged: true, } + +filegroup { + name: "ProxyHandler-aidl-sources", + srcs: ["src/**/*.aidl"], + path: "src", +} diff --git a/packages/services/Proxy/com/android/net/IProxyCallback.aidl b/packages/services/Proxy/src/com/android/net/IProxyCallback.aidl index 26b2a3f9da2d..26b2a3f9da2d 100644 --- a/packages/services/Proxy/com/android/net/IProxyCallback.aidl +++ b/packages/services/Proxy/src/com/android/net/IProxyCallback.aidl diff --git a/packages/services/Proxy/com/android/net/IProxyPortListener.aidl b/packages/services/Proxy/src/com/android/net/IProxyPortListener.aidl index fa4caf3dba91..fa4caf3dba91 100644 --- a/packages/services/Proxy/com/android/net/IProxyPortListener.aidl +++ b/packages/services/Proxy/src/com/android/net/IProxyPortListener.aidl |