diff options
| author | Jaewoong Jung <jungjw@google.com> | 2019-03-27 11:17:14 -0700 |
|---|---|---|
| committer | Jaewoong Jung <jungjw@google.com> | 2019-03-27 11:21:24 -0700 |
| commit | a641ee9cc78840e2067533d83a41aebe070b5b60 (patch) | |
| tree | 14f211d4a935a78726fc390f59e88dc844e5ff3e /java/app_test.go | |
| parent | ac7f27eab0ca0574f14875416fa471137c8736f2 (diff) | |
| download | android_build_soong-a641ee9cc78840e2067533d83a41aebe070b5b60.tar.gz android_build_soong-a641ee9cc78840e2067533d83a41aebe070b5b60.tar.bz2 android_build_soong-a641ee9cc78840e2067533d83a41aebe070b5b60.zip | |
Fix an override_module bug.
proptools.PrependProperties doesn't replace a pointer when both the src
and the dst have one. This prevented override_module from overriding
simple value pointer properties when the base module has existing
values. It turns out this was why the name property needed to be
overwritten manually.
Bug: 122957760
Test: app_test.go
Change-Id: I3302287c31a560422548c22fade95261ddbe606a
Diffstat (limited to 'java/app_test.go')
| -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", }, |