diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-09-15 13:44:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-15 13:44:01 +0000 |
| commit | 063ad070c005bb659c8b8903fdfd9c178ebafd24 (patch) | |
| tree | 15ab9d1007046caef3ccf0ccb13e07cac54c3cba /java | |
| parent | cfbad2bb31849d8f1b6b6eda3c6efbe8f7b512de (diff) | |
| parent | c2c7f3e49b5bfd2bcb882635bc5592c077ce237d (diff) | |
Merge "Rename SdkMemberTypeDependencyTag to SdkMemberDependencyTag" am: c2c7f3e49b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1826225
Change-Id: I304997b8488094a28ef8b75baaf0d9c4341b1512
Diffstat (limited to 'java')
| -rw-r--r-- | java/bootclasspath_fragment.go | 2 | ||||
| -rw-r--r-- | java/hiddenapi_modular.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index f7561b439..b13e2dba4 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -89,7 +89,7 @@ var bootclasspathFragmentContentDepTag = bootclasspathFragmentContentDependencyT var _ android.ExcludeFromVisibilityEnforcementTag = bootclasspathFragmentContentDepTag var _ android.ReplaceSourceWithPrebuilt = bootclasspathFragmentContentDepTag -var _ android.SdkMemberTypeDependencyTag = bootclasspathFragmentContentDepTag +var _ android.SdkMemberDependencyTag = bootclasspathFragmentContentDepTag var _ android.CopyDirectlyInAnyApexTag = bootclasspathFragmentContentDepTag var _ android.RequiresFilesFromPrebuiltApexTag = bootclasspathFragmentContentDepTag diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go index 8e39f408e..51cd50169 100644 --- a/java/hiddenapi_modular.go +++ b/java/hiddenapi_modular.go @@ -218,7 +218,7 @@ func (b hiddenAPIStubsDependencyTag) ExcludeFromVisibilityEnforcement() { var _ android.ExcludeFromVisibilityEnforcementTag = hiddenAPIStubsDependencyTag{} var _ android.ReplaceSourceWithPrebuilt = hiddenAPIStubsDependencyTag{} var _ android.ExcludeFromApexContentsTag = hiddenAPIStubsDependencyTag{} -var _ android.SdkMemberTypeDependencyTag = hiddenAPIStubsDependencyTag{} +var _ android.SdkMemberDependencyTag = hiddenAPIStubsDependencyTag{} // hiddenAPIComputeMonolithicStubLibModules computes the set of module names that provide stubs // needed to produce the hidden API monolithic stub flags file. |