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

Commit 847f230c authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "clean up hard-coded min_sdk_version (statsd)"

parents a1751260 cc60da80

android/apex.go

+0 −9
Original line number Diff line number Diff line
@@ -757,7 +757,6 @@ var minSdkVersionAllowlist = func(apiMap map[string]int) map[string]ApiLevel { 
	"captiveportal-lib":              28,

	"flatbuffer_headers":             30,

	"framework-permission":           30,

	"framework-statsd":               30,

	"gemmlowp_headers":               30,

	"ike-internals":                  30,

	"kotlinx-coroutines-android":     28,
@@ -790,11 +789,6 @@ var minSdkVersionAllowlist = func(apiMap map[string]int) map[string]ApiLevel { 
	"libprotobuf-java-lite":          30,

	"libprotoutil":                   30,

	"libqemu_pipe":                   30,

	"libstats_jni":                   30,

	"libstatslog_statsd":             30,

	"libstatsmetadata":               30,

	"libstatspull":                   30,

	"libstatssocket":                 30,

	"libsync":                        30,

	"libtextclassifier_hash_headers": 30,

	"libtextclassifier_hash_static":  30,
@@ -807,9 +801,6 @@ var minSdkVersionAllowlist = func(apiMap map[string]int) map[string]ApiLevel { 
	"philox_random_headers":          30,

	"philox_random":                  30,

	"service-permission":             30,

	"service-statsd":                 30,

	"statsd-aidl-ndk_platform":       30,

	"statsd":                         30,

	"tensorflow_headers":             30,

	"xz-java":                        29,

})

apex/allowed_deps.txt

+8 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ framework-permission-s(minSdkVersion:30) 
framework-permission-s-shared(minSdkVersion:30)

framework-sdkextensions(minSdkVersion:30)

framework-sdkextensions(minSdkVersion:current)

framework-statsd(minSdkVersion:30)

framework-statsd(minSdkVersion:current)

framework-tethering(minSdkVersion:30)

framework-tethering(minSdkVersion:current)
@@ -425,11 +426,15 @@ libstagefright_mp3dec_headers(minSdkVersion:29) 
libstagefright_mpeg2extractor(minSdkVersion:29)

libstagefright_mpeg2support_nocrypto(minSdkVersion:29)

libstats_jni(minSdkVersion:(no version))

libstats_jni(minSdkVersion:30)

libstatslog_resolv(minSdkVersion:29)

libstatslog_statsd(minSdkVersion:(no version))

libstatslog_statsd(minSdkVersion:30)

libstatspull(minSdkVersion:(no version))

libstatspull(minSdkVersion:30)

libstatspush_compat(minSdkVersion:29)

libstatssocket(minSdkVersion:(no version))

libstatssocket(minSdkVersion:30)

libstatssocket_headers(minSdkVersion:29)

libstd(minSdkVersion:29)

libsystem_headers(minSdkVersion:apex_inherit)
@@ -592,6 +597,7 @@ service-media-s(minSdkVersion:29) 
service-permission(minSdkVersion:30)

service-permission(minSdkVersion:current)

service-permission-shared(minSdkVersion:30)

service-statsd(minSdkVersion:30)

service-statsd(minSdkVersion:current)

SettingsLibActionBarShadow(minSdkVersion:21)

SettingsLibAppPreference(minSdkVersion:21)
@@ -605,7 +611,9 @@ SettingsLibSettingsTheme(minSdkVersion:21) 
SettingsLibUtils(minSdkVersion:21)

stats_proto(minSdkVersion:29)

statsd(minSdkVersion:(no version))

statsd(minSdkVersion:30)

statsd-aidl-ndk_platform(minSdkVersion:(no version))

statsd-aidl-ndk_platform(minSdkVersion:30)

statsprotos(minSdkVersion:29)

tensorflow_headers(minSdkVersion:(no version))

Tethering(minSdkVersion:30)