StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove libandroid_support support." into main

Browse Source
This commit is contained in:
Dan Albert
2023-07-21 21:06:41 +00:00
committed by Gerrit Code Review
parent cc8c8e5f8d 94dd5651d7
commit 460fb2d6d5
3 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/api_levels.go
View File

@@ -275,10 +275,6 @@ var FirstAndroidRelrVersion = uncheckedFinalApiLevel(28)
// relocations itself. // relocations itself.
var FirstPackedRelocationsVersion = uncheckedFinalApiLevel(23) var FirstPackedRelocationsVersion = uncheckedFinalApiLevel(23)
// The first API level that does not require NDK code to link
// libandroid_support.
var FirstNonLibAndroidSupportVersion = uncheckedFinalApiLevel(21)
// LastWithoutModuleLibCoreSystemModules is the last API level where prebuilts/sdk does not contain // LastWithoutModuleLibCoreSystemModules is the last API level where prebuilts/sdk does not contain
// a core-for-system-modules.jar for the module-lib API scope. // a core-for-system-modules.jar for the module-lib API scope.
var LastWithoutModuleLibCoreSystemModules = uncheckedFinalApiLevel(31) var LastWithoutModuleLibCoreSystemModules = uncheckedFinalApiLevel(31)

10
cc/stl.go
View File

@@ -120,11 +120,6 @@ func (stl *stl) begin(ctx BaseModuleContext) {
}() }()
} }
func needsLibAndroidSupport(ctx BaseModuleContext) bool {
version := nativeApiLevelOrPanic(ctx, ctx.sdkVersion())
return version.LessThan(android.FirstNonLibAndroidSupportVersion)
}
func staticUnwinder(ctx android.BaseModuleContext) string { func staticUnwinder(ctx android.BaseModuleContext) string {
vndkVersion := ctx.Module().(*Module).VndkVersion() vndkVersion := ctx.Module().(*Module).VndkVersion()
@@ -184,11 +179,6 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps {
} else { } else {
deps.StaticLibs = append(deps.StaticLibs, stl.Properties.SelectedStl, "ndk_libc++abi") deps.StaticLibs = append(deps.StaticLibs, stl.Properties.SelectedStl, "ndk_libc++abi")
} }
if needsLibAndroidSupport(ctx) {
// Use LateStaticLibs for ndk_libandroid_support so that its include directories
// come after ndk_libc++_static or ndk_libc++_shared.
deps.LateStaticLibs = append(deps.LateStaticLibs, "ndk_libandroid_support")
}
deps.StaticLibs = append(deps.StaticLibs, "ndk_libunwind") deps.StaticLibs = append(deps.StaticLibs, "ndk_libunwind")
default: default:
panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl)) panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl))

24
cc/testing.go
View File

@@ -423,11 +423,6 @@ func commonDefaultModules() string {
export_include_dirs: ["ndk_libc++_shared"], export_include_dirs: ["ndk_libc++_shared"],
} }
ndk_prebuilt_static_stl {
name: "ndk_libandroid_support",
export_include_dirs: ["ndk_libandroid_support"],
}
cc_library_static { cc_library_static {
name: "libgoogle-benchmark", name: "libgoogle-benchmark",
sdk_version: "current", sdk_version: "current",
@@ -573,16 +568,15 @@ var PrepareForTestWithCcDefaultModules = android.GroupFixturePreparers(
// Additional files needed in tests that disallow non-existent source. // Additional files needed in tests that disallow non-existent source.
android.MockFS{ android.MockFS{
"defaults/cc/common/libc.map.txt": nil, "defaults/cc/common/libc.map.txt": nil,
"defaults/cc/common/libdl.map.txt": nil, "defaults/cc/common/libdl.map.txt": nil,
"defaults/cc/common/libm.map.txt": nil, "defaults/cc/common/libm.map.txt": nil,
"defaults/cc/common/ndk_libandroid_support": nil, "defaults/cc/common/ndk_libc++_shared": nil,
"defaults/cc/common/ndk_libc++_shared": nil, "defaults/cc/common/crtbegin_so.c": nil,
"defaults/cc/common/crtbegin_so.c": nil, "defaults/cc/common/crtbegin.c": nil,
"defaults/cc/common/crtbegin.c": nil, "defaults/cc/common/crtend_so.c": nil,
"defaults/cc/common/crtend_so.c": nil, "defaults/cc/common/crtend.c": nil,
"defaults/cc/common/crtend.c": nil, "defaults/cc/common/crtbrand.c": nil,
"defaults/cc/common/crtbrand.c": nil,
"defaults/cc/common/libclang_rt.ubsan_minimal.android_arm64.a": nil, "defaults/cc/common/libclang_rt.ubsan_minimal.android_arm64.a": nil,
"defaults/cc/common/libclang_rt.ubsan_minimal.android_arm.a": nil, "defaults/cc/common/libclang_rt.ubsan_minimal.android_arm.a": nil,