openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "clean up hard-coded min_sdk_version (statsd)" am: 847f230c78 am: b54a375308 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1589772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8618be03a4a016e4855e9651a803f2750625787d
This commit is contained in:
Jooyung Han 2021-02-18 00:47:43 +00:00 committed by Automerger Merge Worker
parent bb4c44e0c2 b54a375308
commit 0fef947255
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
android/apex.go
View File

@ -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,
})

8
apex/allowed_deps.txt
View File

@ -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)
@ -426,11 +427,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)
@ -593,6 +598,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)
@ -606,7 +612,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)