StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "java_sdk_library: Stop disabling copy to dist when sdk_version: none" am: 05c2f3e29a am: d94bd1ddff

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1506239

Change-Id: I26c1ab23c697f160aaa99a3f3b8e864c6b1b0e81
This commit is contained in:
Paul Duffin
2020-11-20 13:30:20 +00:00
committed by Automerger Merge Worker
parent ee09b2228f d94bd1ddff
commit b2c13926b1
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/sdk_library.go
View File

@@ -1514,12 +1514,6 @@ func (module *SdkLibrary) CreateInternalModules(mctx android.DefaultableHookCont
hasSystemAndTestApis := sdkDep.hasStandardLibs() hasSystemAndTestApis := sdkDep.hasStandardLibs()
module.sdkLibraryProperties.Generate_system_and_test_apis = hasSystemAndTestApis module.sdkLibraryProperties.Generate_system_and_test_apis = hasSystemAndTestApis
// Unless explicitly specified assume that any module that does not provide system
// and test APIs should not contribute to the dist build.
if module.sdkLibraryProperties.No_dist == nil {
module.sdkLibraryProperties.No_dist = proptools.BoolPtr(!hasSystemAndTestApis)
}
missing_current_api := false missing_current_api := false
generatedScopes := module.getGeneratedApiScopes(mctx) generatedScopes := module.getGeneratedApiScopes(mctx)