diff options
author | Aurimas Liutikas <aurimas@google.com> | 2021-05-12 22:53:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 22:53:00 +0000 |
commit | 8630738d0a775a2f8e5bc09c437556bd75d8b620 (patch) | |
tree | 6f59a75348d07612173246ac6c4fca04bde0df2c /java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java | |
parent | 0cd6a8551365e02a1687415356215ba2061739cd (diff) | |
parent | 5480a6c05f0c4727b3dd154709f40fdae8d8b4a2 (diff) | |
download | dagger2-8630738d0a775a2f8e5bc09c437556bd75d8b620.tar.gz |
Merge "Revert "Merge commit 'upstream/dagger-2.35.1^'"" am: 5882ce8935 am: 5480a6c05f
Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705751
Change-Id: I2f7a4d61b9f48965273925620a8dc0afc43c9bef
Diffstat (limited to 'java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java')
-rw-r--r-- | java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java b/java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java index 60864c2c2..aa69e40e1 100644 --- a/java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java +++ b/java/dagger/hilt/processor/internal/definecomponent/DefineComponentMetadatas.java @@ -163,25 +163,15 @@ final class DefineComponentMetadatas { ? Optional.empty() : Optional.of(get(parent, childPath)); - ClassName componentClassName = ClassName.get(component); - ProcessorErrors.checkState( parentComponent.isPresent() - || componentClassName.equals(ClassNames.SINGLETON_COMPONENT), + || ClassName.get(component).equals(ClassNames.SINGLETON_COMPONENT), component, "@DefineComponent %s is missing a parent declaration.\n" + "Please declare the parent, for example: @DefineComponent(parent =" + " SingletonComponent.class)", component); - ProcessorErrors.checkState( - componentClassName.equals(ClassNames.SINGLETON_COMPONENT) - || !componentClassName.simpleName().equals(ClassNames.SINGLETON_COMPONENT.simpleName()), - component, - "Cannot have a component with the same simple name as the reserved %s: %s", - ClassNames.SINGLETON_COMPONENT.simpleName(), - componentClassName); - return new AutoValue_DefineComponentMetadatas_DefineComponentMetadata( component, scopes, parentComponent); } |