diff options
| author | Artur Satayev <satayev@google.com> | 2021-05-20 15:15:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-20 15:15:36 +0000 |
| commit | 5e7876f0cefc076e40f72b04158bb00e91614c2a (patch) | |
| tree | e1a18520138375dccd5da9f20312283e00370b3e | |
| parent | 29d8b3d8db1f72306ed84d2ad960ab0fe15da2e7 (diff) | |
| parent | 794cdc4facb7b1540947303cdc7a665a62091c11 (diff) | |
| download | GeoTZ-5e7876f0cefc076e40f72b04158bb00e91614c2a.tar.gz | |
Merge "Add systemserverclasspath_fragment." into sc-dev am: 794cdc4fac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/GeoTZ/+/14608035
Change-Id: I13236091e8a0f37b939ae6abf2a594bd0adfa544
| -rw-r--r-- | apex/com.android.geotz/Android.bp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/apex/com.android.geotz/Android.bp b/apex/com.android.geotz/Android.bp index 2c063d3..f0e977b 100644 --- a/apex/com.android.geotz/Android.bp +++ b/apex/com.android.geotz/Android.bp @@ -28,10 +28,7 @@ apex_defaults { // module. file_contexts: ":com.android.geotz-file_contexts", - // This name is hardcoded on Android S with associated AndroidManifest.xml - // entries in the system server. Do not remove until all releases use an - // APK. - java_libs: ["geotz"], + systemserverclasspath_fragments: ["com.android.geotz-systemserverclasspath-fragment"], // Shared signing information. key: "com.android.geotz.key", @@ -49,6 +46,16 @@ android_app_certificate { certificate: "com.android.geotz", } +// Encapsulate the contributions made by the com.android.geotz to the systemserverclasspath. +systemserverclasspath_fragment { + name: "com.android.geotz-systemserverclasspath-fragment", + // This name is hardcoded on Android S with associated AndroidManifest.xml + // entries in the system server. Do not remove until all releases use an + // APK. + contents: ["geotz"], + apex_available: ["com.android.geotz"], +} + // The definition for the real (not test) geotz APEX. apex { name: "com.android.geotz", @@ -70,6 +77,8 @@ java_library { "offlinelocationtimezoneprovider", ], sdk_version: "system_current", + // TODO(b/188773212): force dex compilation for inclusion in bootclasspath_fragment. + compile_dex: true, apex_available: [ "com.android.geotz", ], |