Merge "Introduce AlwaysUsePrebuiltSdks"

2020-08-10 00:51:56 +00:00
parent 91c3e4ec1a 816a23a50d
commit 6df337255c
12 changed files with 59 additions and 45 deletions
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -1799,7 +1799,7 @@ func (module *SdkLibraryImport) Name() string {
 func (module *SdkLibraryImport) createInternalModules(mctx android.DefaultableHookContext) {

 	// If the build is configured to use prebuilts then force this to be preferred.
-	if mctx.Config().UnbundledBuildUsePrebuiltSdks() {
+	if mctx.Config().AlwaysUsePrebuiltSdks() {
 		module.prebuilt.ForcePrefer()
 	}