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:
11
cc/linker.go
11
cc/linker.go
@@ -158,13 +158,6 @@ type BaseLinkerProperties struct {
|
||||
// the ramdisk variant of the C/C++ module.
|
||||
Exclude_static_libs []string
|
||||
}
|
||||
Platform struct {
|
||||
// list of shared libs that should be use to build the platform variant
|
||||
// of a module that sets sdk_version. This should rarely be necessary,
|
||||
// in most cases the same libraries are available for the SDK and platform
|
||||
// variants.
|
||||
Shared_libs []string
|
||||
}
|
||||
}
|
||||
|
||||
// make android::build:GetBuildNumber() available containing the build ID.
|
||||
@@ -262,10 +255,6 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
|
||||
deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Target.Recovery.Exclude_static_libs)
|
||||
}
|
||||
|
||||
if !ctx.useSdk() {
|
||||
deps.SharedLibs = append(deps.SharedLibs, linker.Properties.Target.Platform.Shared_libs...)
|
||||
}
|
||||
|
||||
if ctx.toolchain().Bionic() {
|
||||
// libclang_rt.builtins and libatomic have to be last on the command line
|
||||
if !Bool(linker.Properties.No_libcrt) {
|
||||
|
Reference in New Issue
Block a user