Revert "Add sdk mutator for native modules"
Revert submission 1242911-sdk_version_variant Reason for revert: b/153394225 Reverted Changes: Ife99745fb:Use libnativewindow for platform variant of libagq... I1bae84c43:Use libnativewindow for platform variant of androi... I6e6021ed3:Use stl to depend on libc++ Ife99745fb:Use libnativewindow for platform variant of libRSS... I2c9f439b9:Fix static dependency on libprotobuf-cpp-lite-ndk Iff2aff9cf:Set sdk_version for cc_genrules used by modules wi... I7d72934aa:Add sdk mutator for native modules Ief378a007:Use sdk variant of Soong modules when LOCAL_SDK_VE... Bug: 149591340 Change-Id: I798fa902c779469c6382b6699351e5d12bf14785 Fixes: 153394225
This commit is contained in:
65
cc/sdk.go
65
cc/sdk.go
@@ -1,65 +0,0 @@
|
||||
// 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:
|
||||
if m.AlwaysSdk() {
|
||||
if !m.UseSdk() {
|
||||
ctx.ModuleErrorf("UseSdk() must return true when AlwaysSdk is set, did the factory forget to set Sdk_version?")
|
||||
}
|
||||
ctx.CreateVariations("sdk")
|
||||
} else if m.UseSdk() {
|
||||
modules := ctx.CreateVariations("", "sdk")
|
||||
modules[0].(*Module).Properties.Sdk_version = nil
|
||||
modules[1].(*Module).Properties.IsSdkVariant = true
|
||||
|
||||
if ctx.Config().UnbundledBuild() {
|
||||
modules[0].(*Module).Properties.HideFromMake = true
|
||||
} else {
|
||||
modules[1].(*Module).Properties.SdkAndPlatformVariantVisibleToMake = true
|
||||
modules[1].(*Module).Properties.PreventInstall = true
|
||||
}
|
||||
ctx.AliasVariation("")
|
||||
} else {
|
||||
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("")
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user