diff options
| author | 2022-05-10 18:20:27 +0000 | |
|---|---|---|
| committer | 2022-05-10 18:20:27 +0000 | |
| commit | f923333a93bf595e7ac26c6dfd473de0068ced6e (patch) | |
| tree | b05a63845cb1ad3e02bfe64526110e46c9ace6ec /java/app_test.go | |
| parent | c275b81fc7a1e24b75175841c1158cc52cc58be2 (diff) | |
| parent | 42e89508eeb7d24bac5eb71b48aa89fbf5ed8aee (diff) | |
Merge changes Ie8881b85,I6c064f8a
* changes:
Enforce updatable=true on apps of updatable apexes
Update sdk_version check for jni_libs of updatable apps
Diffstat (limited to 'java/app_test.go')
| -rw-r--r-- | java/app_test.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/java/app_test.go b/java/app_test.go index 8324dff6c..b83a3337d 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -427,7 +427,8 @@ func TestUpdatableApps_JniLibShouldBeBuiltAgainstMinSdkVersion(t *testing.T) { name: "libjni", stl: "none", system_shared_libs: [], - sdk_version: "29", + sdk_version: "current", + min_sdk_version: "29", } ` fs := map[string][]byte{ @@ -481,12 +482,13 @@ func TestUpdatableApps_ErrorIfJniLibDoesntSupportMinSdkVersion(t *testing.T) { name: "libjni", stl: "none", sdk_version: "current", + min_sdk_version: "current", } ` - testJavaError(t, `"libjni" .*: sdk_version\(current\) is higher than min_sdk_version\(29\)`, bp) + testJavaError(t, `"libjni" .*: min_sdk_version\(current\) is higher than min_sdk_version\(29\)`, bp) } -func TestUpdatableApps_ErrorIfDepSdkVersionIsHigher(t *testing.T) { +func TestUpdatableApps_ErrorIfDepMinSdkVersionIsHigher(t *testing.T) { bp := cc.GatherRequiredDepsForTest(android.Android) + ` android_app { name: "foo", @@ -503,6 +505,7 @@ func TestUpdatableApps_ErrorIfDepSdkVersionIsHigher(t *testing.T) { shared_libs: ["libbar"], system_shared_libs: [], sdk_version: "27", + min_sdk_version: "27", } cc_library { @@ -510,6 +513,7 @@ func TestUpdatableApps_ErrorIfDepSdkVersionIsHigher(t *testing.T) { stl: "none", system_shared_libs: [], sdk_version: "current", + min_sdk_version: "current", } ` testJavaError(t, `"libjni" .*: links "libbar" built against newer API version "current"`, bp) |