drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Temporarily add IKE to non-updatable stubs build"

Browse Source
This commit is contained in:
Anton Hansson
2021-02-05 17:29:05 +00:00
committed by Gerrit Code Review
parent 9a5b717514 b7d532e4c8
commit 6869137dfa
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
StubLibraries.bp
View File

@ -84,6 +84,8 @@ stubs_defaults {
// full sdk to ensure we can resolve them. If a new class gets added, // full sdk to ensure we can resolve them. If a new class gets added,
// the prebuilts/sdk/current needs to be updated. // the prebuilts/sdk/current needs to be updated.
"sdk_system_current_android", "sdk_system_current_android",
// NOTE: The below can be removed once the prebuilt stub contains IKE.
"sdk_system_current_android.net.ipsec.ike",
], ],
high_mem: true, // Lots of sources => high memory use, see b/170701554 high_mem: true, // Lots of sources => high memory use, see b/170701554
installable: false, installable: false,
@ -391,7 +393,11 @@ java_library_static {
"android_defaults_stubs_current", "android_defaults_stubs_current",
"android_stubs_dists_default", "android_stubs_dists_default",
], ],
libs: ["sdk_system_current_android"], libs: [
"sdk_system_current_android",
// NOTE: The below can be removed once the prebuilt stub contains IKE.
"sdk_system_current_android.net.ipsec.ike",
],
static_libs: ["art.module.public.api.stubs"], static_libs: ["art.module.public.api.stubs"],
dist: { dist: {
dir: "apistubs/android/module-lib", dir: "apistubs/android/module-lib",