diff options
| author | 2020-05-25 01:55:59 +0000 | |
|---|---|---|
| committer | 2020-05-25 02:05:54 +0000 | |
| commit | 43e173498514238f6979cae80e7d6b36e628cd7d (patch) | |
| tree | 0ae8c8f7d55b214206140d1d46cf5e7dff2ff98d /java/sdk_library.go | |
| parent | ed0314270d226d5a8769439a607f79b8c974f793 (diff) | |
Revert "java_sdk_library: Do not expose stubs implementation jar"
Revert submission 11569833
Reason for revert: Broke presubmit: b/157231582
Reverted Changes:
Ia99def91e:Improve tracking of exported sdk libraries
If91b4d106:java_sdk_library: Do not expose stubs implementati...
Id6d76e56c:java_sdk_library: Access outputs using tags
Change-Id: I87e459d45ee97e284a9d966d5446305f80627175
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 5efb4d045..684a0026f 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -694,7 +694,7 @@ func (c *commonToSdkLibraryAndImport) findClosestScopePath(scope *apiScope) *sco return nil } -func (c *commonToSdkLibraryAndImport) selectHeaderJarsForSdkVersion(ctx android.BaseModuleContext, sdkVersion sdkSpec) android.Paths { +func (c *commonToSdkLibraryAndImport) sdkJarsCommon(ctx android.BaseModuleContext, sdkVersion sdkSpec, headerJars bool) android.Paths { // If a specific numeric version has been requested then use prebuilt versions of the sdk. if sdkVersion.version.isNumbered() { @@ -725,7 +725,11 @@ func (c *commonToSdkLibraryAndImport) selectHeaderJarsForSdkVersion(ctx android. return nil } - return paths.stubsHeaderPath + if headerJars { + return paths.stubsHeaderPath + } else { + return paths.stubsImplPath + } } type SdkLibrary struct { @@ -1196,7 +1200,7 @@ func (module *SdkLibrary) sdkJars(ctx android.BaseModuleContext, sdkVersion sdkS return module.HeaderJars() } - return module.selectHeaderJarsForSdkVersion(ctx, sdkVersion) + return module.sdkJarsCommon(ctx, sdkVersion, headerJars) } // to satisfy SdkLibraryDependency interface @@ -1635,7 +1639,11 @@ func (module *sdkLibraryImport) GenerateAndroidBuildActions(ctx android.ModuleCo } func (module *sdkLibraryImport) sdkJars(ctx android.BaseModuleContext, sdkVersion sdkSpec) android.Paths { - return module.selectHeaderJarsForSdkVersion(ctx, sdkVersion) + + // The java_sdk_library_import can only ever give back header jars as it does not + // have an implementation jar. + headerJars := true + return module.sdkJarsCommon(ctx, sdkVersion, headerJars) } // to satisfy SdkLibraryDependency interface |