Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 460fb2d6 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Remove libandroid_support support." into main

parents cc8c8e5f 94dd5651

android/api_levels.go

+0 −4
Original line number Diff line number Diff line
@@ -275,10 +275,6 @@ var FirstAndroidRelrVersion = uncheckedFinalApiLevel(28) 
// relocations itself.

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

// a core-for-system-modules.jar for the module-lib API scope.

var LastWithoutModuleLibCoreSystemModules = uncheckedFinalApiLevel(31)

cc/stl.go

+0 −10
Original line number Diff line number Diff line
@@ -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 {

	vndkVersion := ctx.Module().(*Module).VndkVersion()
@@ -184,11 +179,6 @@ func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps { 
		} else {

			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")

	default:

		panic(fmt.Errorf("Unknown stl: %q", stl.Properties.SelectedStl))

cc/testing.go

+9 −15
Original line number Diff line number Diff line
@@ -423,11 +423,6 @@ func commonDefaultModules() string { 
			export_include_dirs: ["ndk_libc++_shared"],

		}



		ndk_prebuilt_static_stl {

			name: "ndk_libandroid_support",

			export_include_dirs: ["ndk_libandroid_support"],

		}



		cc_library_static {

			name: "libgoogle-benchmark",

			sdk_version: "current",
@@ -576,7 +571,6 @@ var PrepareForTestWithCcDefaultModules = android.GroupFixturePreparers( 
		"defaults/cc/common/libc.map.txt":      nil,

		"defaults/cc/common/libdl.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/crtbegin_so.c":     nil,

		"defaults/cc/common/crtbegin.c":        nil,