diff options
| author | 2020-09-24 16:53:04 +0100 | |
|---|---|---|
| committer | 2020-09-28 22:32:02 +0100 | |
| commit | 618b671bf40a5b3240b83e0e645a8ce35945c4ff (patch) | |
| tree | bc343e3ec186c92456439aeda2e231e185b7308b /sdk/cc_sdk_test.go | |
| parent | ca17414206c5bed1c25383921ae6c92a765306d0 (diff) | |
Retain all stubs versions in the snapshot.
This is a quick fix to avoid build failures due to prebuilts lacking
stubs versions that the sources have, which causes dependencies on
older version stubs fail on master-art-host where the sources of e.g.
Bionic are no longer available.
More work is required to make the version handling of stubs DTRT - a
TODO comment outlines it.
Test: m nothing
Test: `m runtime-module-sdk`, check that the generated Android.bp
has the full stubs.versions list like the sources.
Bug: 169373910
Change-Id: I0ebfaf94f9d45a0e58d9785c40e7cea626f0ab83
Diffstat (limited to 'sdk/cc_sdk_test.go')
| -rw-r--r-- | sdk/cc_sdk_test.go | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go index 8c9e2285d..a12bc6f91 100644 --- a/sdk/cc_sdk_test.go +++ b/sdk/cc_sdk_test.go @@ -2330,7 +2330,11 @@ cc_prebuilt_library_shared { installable: false, compile_multilib: "both", stubs: { - versions: ["3"], + versions: [ + "1", + "2", + "3", + ], }, arch: { arm64: { @@ -2347,7 +2351,11 @@ cc_prebuilt_library_shared { prefer: false, compile_multilib: "both", stubs: { - versions: ["3"], + versions: [ + "1", + "2", + "3", + ], }, arch: { arm64: { @@ -2401,7 +2409,11 @@ cc_prebuilt_library_shared { installable: false, compile_multilib: "both", stubs: { - versions: ["3"], + versions: [ + "1", + "2", + "3", + ], }, target: { host: { @@ -2431,7 +2443,11 @@ cc_prebuilt_library_shared { host_supported: true, compile_multilib: "both", stubs: { - versions: ["3"], + versions: [ + "1", + "2", + "3", + ], }, target: { host: { |