diff options
| author | Jaewoong Jung <jungjw@google.com> | 2019-03-27 16:13:22 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-27 16:13:22 -0700 |
| commit | a4edf844da9991a9584f612cbe220458b7cb4574 (patch) | |
| tree | 931a28ea41b478e8309aa9e5ea3059da28d7c134 /java | |
| parent | 1093f63255c192024f82bf072b9ee14e95991578 (diff) | |
| parent | ac24969630a0bbc67c593784cc6070cb11be7070 (diff) | |
| download | build_soong-a4edf844da9991a9584f612cbe220458b7cb4574.tar.gz build_soong-a4edf844da9991a9584f612cbe220458b7cb4574.tar.bz2 build_soong-a4edf844da9991a9584f612cbe220458b7cb4574.zip | |
Merge "Fix an override_module bug." am: 044ead6b1a am: 5ce95f2eaf
am: ac24969630
Change-Id: I352a380486600c0b48a61daa0457eff09ceb8f66
Diffstat (limited to 'java')
| -rw-r--r-- | java/app_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/app_test.go b/java/app_test.go index 781fdfff..1f6297c2 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -877,6 +877,7 @@ func TestOverrideAndroidApp(t *testing.T) { android_app { name: "foo", srcs: ["a.java"], + certificate: "expiredkey", overrides: ["baz"], } @@ -909,7 +910,7 @@ func TestOverrideAndroidApp(t *testing.T) { { variantName: "android_common", apkPath: "/target/product/test_device/system/app/foo/foo.apk", - signFlag: "build/target/product/security/testkey.x509.pem build/target/product/security/testkey.pk8", + signFlag: "build/target/product/security/expiredkey.x509.pem build/target/product/security/expiredkey.pk8", overrides: []string{"baz"}, aaptFlag: "", }, @@ -923,7 +924,7 @@ func TestOverrideAndroidApp(t *testing.T) { { variantName: "baz_android_common", apkPath: "/target/product/test_device/system/app/baz/baz.apk", - signFlag: "build/target/product/security/testkey.x509.pem build/target/product/security/testkey.pk8", + signFlag: "build/target/product/security/expiredkey.x509.pem build/target/product/security/expiredkey.pk8", overrides: []string{"baz", "foo"}, aaptFlag: "--rename-manifest-package org.dandroid.bp", }, |