bd3a16b5e7
This effectively undoes both If6c3ee82d588e2742c85cef7244c090c93f38b8e and I682e4f1f477f3024f7719dfaa67006ef335e0640. SDK variants are now installed again, which will fix unbundled builds of cc_test modules. The platform variants used by com.android.virt are now packagable even though they are not installable. Fix the original problem in b/194403710 by adding a flag to platform variants of modules in apexes that are not platform available, and using that to prevent install and packaging dependencies. That allows the HideFromMake flag to go back to being used for preventing install dependencies but not packaging dependencies. Test: TestPackagingWithSkipInstallDeps Test: TestFileSystemShouldInstallCoreVariantIfTargetBuildAppsIsSet Test: TestFileSystemShouldSkipApexLibraries Bug: 194403710 Bug: 268582372 Fixes: 274443025 Change-Id: If5418df3ddbb940bd631caebdf38daa81e71f40e
119 lines
4.2 KiB
Go
119 lines
4.2 KiB
Go
// Copyright 2020 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package cc
|
|
|
|
import (
|
|
"android/soong/android"
|
|
"android/soong/genrule"
|
|
)
|
|
|
|
// sdkMutator sets a creates a platform and an SDK variant for modules
|
|
// that set sdk_version, and ignores sdk_version for the platform
|
|
// variant. The SDK variant will be used for embedding in APKs
|
|
// that may be installed on older platforms. Apexes use their own
|
|
// variants that enforce backwards compatibility.
|
|
func sdkMutator(ctx android.BottomUpMutatorContext) {
|
|
if ctx.Os() != android.Android {
|
|
return
|
|
}
|
|
|
|
switch m := ctx.Module().(type) {
|
|
case LinkableInterface:
|
|
ccModule, isCcModule := ctx.Module().(*Module)
|
|
if m.AlwaysSdk() {
|
|
if !m.UseSdk() && !m.SplitPerApiLevel() {
|
|
ctx.ModuleErrorf("UseSdk() must return true when AlwaysSdk is set, did the factory forget to set Sdk_version?")
|
|
}
|
|
modules := ctx.CreateVariations("sdk")
|
|
modules[0].(*Module).Properties.IsSdkVariant = true
|
|
} else if m.UseSdk() || m.SplitPerApiLevel() {
|
|
modules := ctx.CreateVariations("", "sdk")
|
|
|
|
// Clear the sdk_version property for the platform (non-SDK) variant so later code
|
|
// doesn't get confused by it.
|
|
modules[0].(*Module).Properties.Sdk_version = nil
|
|
|
|
// Mark the SDK variant.
|
|
modules[1].(*Module).Properties.IsSdkVariant = true
|
|
|
|
if ctx.Config().UnbundledBuildApps() {
|
|
// For an unbundled apps build, hide the platform variant from Make.
|
|
modules[0].(*Module).Properties.HideFromMake = true
|
|
modules[0].(*Module).Properties.PreventInstall = true
|
|
} else {
|
|
// For a platform build, mark the SDK variant so that it gets a ".sdk" suffix when
|
|
// exposed to Make.
|
|
modules[1].(*Module).Properties.SdkAndPlatformVariantVisibleToMake = true
|
|
modules[1].(*Module).Properties.PreventInstall = true
|
|
}
|
|
ctx.AliasVariation("")
|
|
} else if isCcModule && ccModule.isImportedApiLibrary() {
|
|
apiLibrary, _ := ccModule.linker.(*apiLibraryDecorator)
|
|
if apiLibrary.hasNDKStubs() && ccModule.canUseSdk() {
|
|
variations := []string{"sdk"}
|
|
if apiLibrary.hasApexStubs() {
|
|
variations = append(variations, "")
|
|
}
|
|
// Handle cc_api_library module with NDK stubs and variants only which can use SDK
|
|
modules := ctx.CreateVariations(variations...)
|
|
// Mark the SDK variant.
|
|
modules[0].(*Module).Properties.IsSdkVariant = true
|
|
if ctx.Config().UnbundledBuildApps() {
|
|
if apiLibrary.hasApexStubs() {
|
|
// For an unbundled apps build, hide the platform variant from Make.
|
|
modules[1].(*Module).Properties.HideFromMake = true
|
|
}
|
|
modules[1].(*Module).Properties.PreventInstall = true
|
|
} else {
|
|
// For a platform build, mark the SDK variant so that it gets a ".sdk" suffix when
|
|
// exposed to Make.
|
|
modules[0].(*Module).Properties.SdkAndPlatformVariantVisibleToMake = true
|
|
// SDK variant is not supposed to be installed
|
|
modules[0].(*Module).Properties.PreventInstall = true
|
|
}
|
|
} else {
|
|
ccModule.Properties.Sdk_version = nil
|
|
ctx.CreateVariations("")
|
|
ctx.AliasVariation("")
|
|
}
|
|
} else {
|
|
if isCcModule {
|
|
// Clear the sdk_version property for modules that don't have an SDK variant so
|
|
// later code doesn't get confused by it.
|
|
ccModule.Properties.Sdk_version = nil
|
|
}
|
|
ctx.CreateVariations("")
|
|
ctx.AliasVariation("")
|
|
}
|
|
case *genrule.Module:
|
|
if p, ok := m.Extra.(*GenruleExtraProperties); ok {
|
|
if String(p.Sdk_version) != "" {
|
|
ctx.CreateVariations("", "sdk")
|
|
} else {
|
|
ctx.CreateVariations("")
|
|
}
|
|
ctx.AliasVariation("")
|
|
}
|
|
case *snapshotModule:
|
|
ctx.CreateVariations("")
|
|
case *CcApiVariant:
|
|
ccApiVariant, _ := ctx.Module().(*CcApiVariant)
|
|
if String(ccApiVariant.properties.Variant) == "ndk" {
|
|
ctx.CreateVariations("sdk")
|
|
} else {
|
|
ctx.CreateVariations("")
|
|
}
|
|
}
|
|
}
|