From a641ee9cc78840e2067533d83a41aebe070b5b60 Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Wed, 27 Mar 2019 11:17:14 -0700 Subject: 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 --- java/app_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'java/app_test.go') 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", }, -- cgit v1.2.3