commit 7020ca00e5d7049a9af1cd212d9a5744b7ed14d1
author Nikita Ioffe <ioffe@google.com> Wed Oct 21 11:29:52 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 21 11:29:52 2020 +0000
tree 80609219500da3748b260bfc2366df57f7a61f3c
parent 17958198a6919688071d93f1688334bbf690376d
parent dd203b6b342f995d7f03b9d312468e9a49e340ad

Merge "Update allowed deps for sdkext apex"

apex/allowed_deps.txt

diff --git a/apex/allowed_deps.txt b/apex/allowed_deps.txt
index cd4b056..07e78af 100644
--- a/apex/allowed_deps.txt
+++ b/apex/allowed_deps.txt
@@ -154,7 +154,9 @@
 crtend_so(minSdkVersion:16)
 crtend_so(minSdkVersion:apex_inherit)
 datastallprotosnano(minSdkVersion:29)
+derive_sdk(minSdkVersion:30)
 derive_sdk(minSdkVersion:current)
+derive_sdk_prefer32(minSdkVersion:30)
 derive_sdk_prefer32(minSdkVersion:current)
 dnsresolver_aidl_interface-unstable-ndk_platform(minSdkVersion:29)
 DocumentsUI-res-lib(minSdkVersion:29)
@@ -165,6 +167,7 @@
 flatbuffer_headers(minSdkVersion:(no version))
 fmtlib(minSdkVersion:29)
 framework-permission(minSdkVersion:current)
+framework-sdkextensions(minSdkVersion:30)
 framework-sdkextensions(minSdkVersion:current)
 framework-statsd(minSdkVersion:current)
 framework-tethering(minSdkVersion:current)