Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a4f978b authored by Colin Cross's avatar Colin Cross
Browse files

Use platform error_prone_annotations, add it to dialer-rootcomponentprocessor 

The jdk-11.0.13 update triggers an error in the errorprone build:
error: cannot access CompatibleWith
  class file for com.google.errorprone.annotations.CompatibleWith not found

Add error_prone_annotations to the dialer-rootcomponentprocessor
dependencies, and replace the other usages of dialer-error-prone-target
in the file to match.

Bug: 205944740
Test: m RUN_ERROR_PRONE=true out/host/common/obj/JAVA_LIBRARIES/dialer-rootcomponentprocessor_intermediates/classes-full-debug.jar
Change-Id: Ic6cf6614e522919b793744313adfd4c8763b4b61
parent 4953fbcf

Android.mk

+3 −15
Original line number Diff line number Diff line
@@ -122,11 +122,11 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
	dialer-mime4j-dom-target \

	dialer-okhttp-target \

	dialer-okio-target \

	dialer-error-prone-target \

	dialer-guava-target \

	dialer-glide-target \

	dialer-glide-annotation-target \

	dialer-zxing-target \

	error_prone_annotations \

	jsr305 \

	libbackup \

	libphonenumber \
@@ -228,19 +228,6 @@ include $(BUILD_PREBUILT) 


include $(CLEAR_VARS)



LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE := dialer-error-prone-target

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE

LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar

LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_PREBUILT)



include $(CLEAR_VARS)



LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE := dialer-dagger2-target

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
@@ -552,7 +539,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
	auto_service_annotations \

	auto_common \

	dialer-javax-annotation-api \

	dialer-javax-inject

	dialer-javax-inject \

	error_prone_annotations



LOCAL_JAVA_LANGUAGE_VERSION := 1.8