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

Commit 1bb1d2a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use platform error_prone_annotations, add it to... 

Merge "Use platform error_prone_annotations, add it to dialer-rootcomponentprocessor" am: a5ba4734

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1899690

Change-Id: I640c0e7ce08a29126de0edcf98f387c10aa58bdd
parents c3a47d79 a5ba4734

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