commit b91dbc5f60c97a15f91366136db5492beafb88b8
author Eric Jeong <ericjeong@google.com> Tue Sep 01 17:33:54 2020 -0700
committer Eric Jeong <ericjeong@google.com> Wed Sep 02 10:11:17 2020 -0700
tree 970bfc7cfdf45e0879361c89263a91f2ec906130
parent dd9ad89a047741ccc855ef499c52590d16afaf2f

Remove duplicated class from boot/system class path

- android.car.userlib was statistically linked with
android.hardware.automotive.vehicle-V2.0-java.
- this causes duplicated class issue in CtsStrictJavaPackagesTestCases
- this CL switches it from static linking to dynamic linking

Bug: 158332694
Test: atest
StrictJavaPackagesTest#testSystemServerClasspath_nonDuplicateClasses

Change-Id: I1713275e80603e6454fe7b4869c7f35208e474b3
Merged-In: I8c6d4936e2efd8a35e32ea887e56bc9714f1a341

tests/CarSecurityPermissionTest/Android.bp

diff --git a/tests/CarSecurityPermissionTest/Android.bp b/tests/CarSecurityPermissionTest/Android.bp
index 066ecc8..7be1d0b 100644
--- a/tests/CarSecurityPermissionTest/Android.bp
+++ b/tests/CarSecurityPermissionTest/Android.bp
@@ -21,6 +21,7 @@
 
     libs: [
         "android.car",
+        "android.hardware.automotive.vehicle-V2.0-java",
         "android.test.runner",
         "android.test.base",
         "android.test.mock",

user/car-user-lib/Android.bp

diff --git a/user/car-user-lib/Android.bp b/user/car-user-lib/Android.bp
index 12bc950..940751a 100644
--- a/user/car-user-lib/Android.bp
+++ b/user/car-user-lib/Android.bp
@@ -17,9 +17,11 @@
     srcs: [
         "src/**/*.java",
     ],
+    libs: [
+        "android.hardware.automotive.vehicle-V2.0-java",
+    ],
     static_libs: [
         "android.car.settings",
-        "android.hardware.automotive.vehicle-V2.0-java",
     ],
     product_variables: {
         pdk: {