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 @@
     // 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 @@
     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 @@
         "offlinelocationtimezoneprovider",
     ],
     sdk_version: "system_current",
+    // TODO(b/188773212): force dex compilation for inclusion in bootclasspath_fragment.
+    compile_dex: true,
     apex_available: [
         "com.android.geotz",
     ],