From 3aef8d2c1f27626b2c9832832fb8c4a6e9893fb5 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 19 Nov 2020 18:49:27 +0000 Subject: [PATCH] java_sdk_library: Stop disabling copy to dist when sdk_version: none Previously, setting "sdk_version: none" would have a side effect of disabling copying to dist by default. This change removes that behavior and will copy to dist by default unless explicitly specified. This will have no impact on the dist because all java_sdk_library modules that relied on the previous behavior to disable copying to dist have been modified to explicitly disable copying to dist. Test: lunch sdk-eng && m dist sdk compare out/dist/apistubs directories before and after this change to make sure that they have not changed. Bug: 173715943 Change-Id: I376546b5a8b03de6c944961f7408dad22184fe49 --- java/sdk_library.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/java/sdk_library.go b/java/sdk_library.go index 99ef7881a..4040bb500 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1514,12 +1514,6 @@ func (module *SdkLibrary) CreateInternalModules(mctx android.DefaultableHookCont hasSystemAndTestApis := sdkDep.hasStandardLibs() 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 generatedScopes := module.getGeneratedApiScopes(mctx)