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

Commit 2c65d2ca authored by Jooyung Han's avatar Jooyung Han
Browse files

Remove min_sdk_version allowlist 

This hard-coded list causes inconsistent behavior regarding -target
triple and _ANDROID_APEX_MIN_SDK_VERSION_ macro for native modules.

Bug: 158059172
Test: m
Merged-In: Iae3ecb3bfaefc2ee73ed38a9268c68b6673f30c5
Change-Id: Iae3ecb3bfaefc2ee73ed38a9268c68b6673f30c5
(cherry picked from commit 870ab9c0f78327d92a871ac58c0337db8ae92245)
parent dd3ea926

android/apex.go

+7 −43
Original line number Diff line number Diff line
@@ -836,40 +836,6 @@ func (d *ApexBundleDepsInfo) BuildDepsInfoLists(ctx ModuleContext, minSdkVersion 
	ctx.Phony(fmt.Sprintf("%s-depsinfo", ctx.ModuleName()), d.fullListPath, d.flatListPath)

}



// TODO(b/158059172): remove minSdkVersion allowlist

var minSdkVersionAllowlist = func(apiMap map[string]int) map[string]ApiLevel {

	list := make(map[string]ApiLevel, len(apiMap))

	for name, finalApiInt := range apiMap {

		list[name] = uncheckedFinalApiLevel(finalApiInt)

	}

	return list

}(map[string]int{

	"androidx-constraintlayout_constraintlayout-solver-nodeps": 29,

	"apache-commons-compress":                                  29,

	"bouncycastle_ike_digests":                                 30,

	"brotli-java":                                              29,

	"flatbuffer_headers":                                       30,

	"gemmlowp_headers":                                         30,

	"ike-internals":                                            30,

	"libbrotli":                                                30,

	"libcrypto_static":                                         30,

	"libeigen":                                                 30,

	"liblz4":                                                   30,

	"libmdnssd":                                                30,

	"libprocpartition":                                         30,

	"libprotobuf-java-lite":                                    30,

	"libprotoutil":                                             30,

	"libtextclassifier_hash_headers":                           30,

	"libtextclassifier_hash_static":                            30,

	"libtflite_kernel_utils":                                   30,

	"libzstd":                                                  30,

	"net-utils-framework-common":                               29,

	"philox_random_headers":                                    30,

	"philox_random":                                            30,

	"tensorflow_headers":                                       30,

	"xz-java":                                                  29,

})



// Function called while walking an APEX's payload dependencies.

//

// Return true if the `to` module should be visited, false otherwise.
@@ -921,7 +887,6 @@ func CheckMinSdkVersion(ctx ModuleContext, minSdkVersion ApiLevel, walk WalkPayl 
		}

		if err := to.ShouldSupportSdkVersion(ctx, minSdkVersion); err != nil {

			toName := ctx.OtherModuleName(to)

			if ver, ok := minSdkVersionAllowlist[toName]; !ok || ver.GreaterThan(minSdkVersion) {

			ctx.OtherModuleErrorf(to, "should support min_sdk_version(%v) for %q: %v."+

				"\n\nDependency path: %s\n\n"+

				"Consider adding 'min_sdk_version: %q' to %q",
@@ -930,7 +895,6 @@ func CheckMinSdkVersion(ctx ModuleContext, minSdkVersion ApiLevel, walk WalkPayl 
				minSdkVersion, toName)

			return false

		}

		}

		return true

	})

}