commit 8497408529976ffa9b8d4a744c128b84cc5ab3c3
author Jun <jjunwangg@google.com> Tue May 14 14:21:04 2019 -0700
committer Jun Wang <jjunwangg@google.com> Wed May 15 00:04:32 2019 +0000
tree 4293b568fc3f11e9a7561a733738c9831875de85
parent b0b44320f00d96c9dbc3b1e63eafbca2718a583e

DO NOT MERGE Remove android.car from static_java_lib

Test: run ' make PRODUCT-hawk-userdebug showcommands dist
ANDROID_COMPILE_WITH_JACK=false EMMA_INSTRUMENT=true
EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true' and observe build
successfully

bug: 129974592
Change-Id: I6269d1cf63e6d7e03038d7a954319706c329a79a

Android.mk

diff --git a/Android.mk b/Android.mk
index 230153e..faaf70f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,8 +38,7 @@
 
 LOCAL_JAVA_LIBRARIES += android.car
 
-LOCAL_STATIC_JAVA_LIBRARIES += jsr305 \
-    android.car
+LOCAL_STATIC_JAVA_LIBRARIES += jsr305
 
 LOCAL_STATIC_ANDROID_LIBRARIES += \
     androidx.legacy_legacy-support-v4