diff options
| author | 2023-03-20 18:52:50 +0000 | |
|---|---|---|
| committer | 2023-03-20 20:50:03 +0000 | |
| commit | 626a8ad9348066fdca52aefe25ce004d8ae56e44 (patch) | |
| tree | 1ef9dd45be6ab9d173d7c21f8e0083473a83e034 /java/hiddenapi_modular.go | |
| parent | 44ac6dad279f320f6c5cae445b5aded0ae5dd847 (diff) | |
Cleanup hardcoded references to android_*stubs_current
These hardcoded refs will need to be updated when we start using .txt
stub equivalent (single-tree/multi-tree). Instead of strewing this logic
all over the codebase, create a helper function that contains the
replacement logic. All other places should call this helper function
instead of calculating the name of .txt equivalent soong module by
itself.
(Will do a similar cleanup in build/make)
Test: no change in ninja file
Change-Id: I6bf999eb4aeaba6ac2a44b9016bae4ec8c79ce19
Diffstat (limited to 'java/hiddenapi_modular.go')
| -rw-r--r-- | java/hiddenapi_modular.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go index be4a48e5b..e2db0cd6b 100644 --- a/java/hiddenapi_modular.go +++ b/java/hiddenapi_modular.go @@ -236,9 +236,9 @@ func hiddenAPIComputeMonolithicStubLibModules(config android.Config) map[*Hidden testStubModules = append(testStubModules, "sdk_test_current_android") } else { // Use stub modules built from source - publicStubModules = append(publicStubModules, "android_stubs_current") - systemStubModules = append(systemStubModules, "android_system_stubs_current") - testStubModules = append(testStubModules, "android_test_stubs_current") + publicStubModules = append(publicStubModules, android.SdkPublic.JavaLibraryName(config)) + systemStubModules = append(systemStubModules, android.SdkSystem.JavaLibraryName(config)) + testStubModules = append(testStubModules, android.SdkTest.JavaLibraryName(config)) } // We do not have prebuilts of the core platform api yet corePlatformStubModules = append(corePlatformStubModules, "legacy.core.platform.api.stubs") |