diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-05-21 19:28:09 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-05-25 09:30:20 +0100 |
| commit | 588e22a6bcb7874c84cfe83bb0b82f4a47cd34cf (patch) | |
| tree | d17453008e4f3a1e62b2573941343532156125f3 /sdk/bootclasspath_fragment_sdk_test.go | |
| parent | 0788cd603894a6d843c8e3017fd3969b898e716c (diff) | |
Tighten bootclasspath_fragment property validation
Previously, due to legacy reasons, the property validation did not
require a contents property and allowed the image_name to be either
"art" or "boot". Those reasons no longer apply and so this change
requires a contents property and only allows the image_name to be set
to "art" if specified.
Bug: 177892522
Test: m nothing
Merged-In: I8855d6e5365ef0b55490e90e7b6c0081cf070ee5
Change-Id: I8855d6e5365ef0b55490e90e7b6c0081cf070ee5
(cherry picked from commit 8018e50ddb141dea7891918c4178a7a394a788d8)
Diffstat (limited to 'sdk/bootclasspath_fragment_sdk_test.go')
| -rw-r--r-- | sdk/bootclasspath_fragment_sdk_test.go | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/sdk/bootclasspath_fragment_sdk_test.go b/sdk/bootclasspath_fragment_sdk_test.go index bd69f06f2..d9fe2816f 100644 --- a/sdk/bootclasspath_fragment_sdk_test.go +++ b/sdk/bootclasspath_fragment_sdk_test.go @@ -424,6 +424,7 @@ func TestBasicSdkWithBootclasspathFragment(t *testing.T) { android.GroupFixturePreparers( prepareForSdkTestWithApex, prepareForSdkTestWithJava, + android.FixtureAddFile("java/mybootlib.jar", nil), android.FixtureWithRootAndroidBp(` sdk { name: "mysdk", @@ -433,16 +434,27 @@ func TestBasicSdkWithBootclasspathFragment(t *testing.T) { bootclasspath_fragment { name: "mybootclasspathfragment", image_name: "art", + contents: ["mybootlib"], apex_available: ["myapex"], } + java_library { + name: "mybootlib", + apex_available: ["myapex"], + srcs: ["Test.java"], + system_modules: "none", + sdk_version: "none", + min_sdk_version: "1", + compile_dex: true, + } + sdk_snapshot { name: "mysdk@1", - bootclasspath_fragments: ["mybootclasspathfragment_mysdk_1"], + bootclasspath_fragments: ["mysdk_mybootclasspathfragment@1"], } prebuilt_bootclasspath_fragment { - name: "mybootclasspathfragment_mysdk_1", + name: "mysdk_mybootclasspathfragment@1", sdk_member_name: "mybootclasspathfragment", prefer: false, visibility: ["//visibility:public"], @@ -450,6 +462,15 @@ func TestBasicSdkWithBootclasspathFragment(t *testing.T) { "myapex", ], image_name: "art", + contents: ["mysdk_mybootlib@1"], + } + + java_import { + name: "mysdk_mybootlib@1", + sdk_member_name: "mybootlib", + visibility: ["//visibility:public"], + apex_available: ["com.android.art"], + jars: ["java/mybootlib.jar"], } `), ).RunTest(t) |