commit d2744bca566beedbb88d6a1d70d50f66b94a0541
author Ulya Trafimovich <skvadrik@google.com> Tue Mar 17 12:34:55 2020 +0000
committer Ulya Trafimovich <skvadrik@google.com> Mon Mar 23 10:21:48 2020 +0000
tree 2b1a2bd8072770637c233a0f1d1ed4da97358dbb
parent 352e6a4d183759315de61db6a96c110f5e1d4381

Put com.android.location.provider before services on the system server classpath.

Test: aosp_walleye-userdebug boots and there are no messages in the
  logcat regarding class loader context mismatch:

    $ adb logcat | grep 'mismatch'
    # empty

Bug: 147017252
Change-Id: I338685b9cf71681b5ca0c541752948934b656b46
Merged-In: I338685b9cf71681b5ca0c541752948934b656b46
(cherry picked from commit db088602f5e6bcdc7f2475493c2d70a92992ce5e)

target/product/media_system.mk

diff --git a/target/product/media_system.mk b/target/product/media_system.mk
index 5749ed5..a83e609 100644
--- a/target/product/media_system.mk
+++ b/target/product/media_system.mk
@@ -50,10 +50,10 @@
 
 # The order here is the same order they end up on the classpath, so it matters.
 PRODUCT_SYSTEM_SERVER_JARS := \
+    com.android.location.provider \
     services \
     ethernet-service \
     wifi-service \
-    com.android.location.provider \
 
 # system server jars which are updated via apex modules.
 # The values should be of the format <apex name>:<jar name>