StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using build/target -> build/make/target symlink

Browse Source 
Instead, fully specify build/make/target/... everywhere

Test: treehugger
Change-Id: I07ba0e9b0604919a271afd5133070616e1f404fc
This commit is contained in:
Dan Willemsen
2019-04-09 21:36:26 -07:00
parent c4bd8f8282
commit 412160e1c9
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/app_test.go
View File

@@ -712,7 +712,7 @@ func TestCertificates(t *testing.T) {
}
`,
certificateOverride: "",
expected: "build/target/product/security/testkey.x509.pem build/target/product/security/testkey.pk8",
expected: "build/make/target/product/security/testkey.x509.pem build/make/target/product/security/testkey.pk8",
},
{
name: "module certificate property",
@@ -741,7 +741,7 @@ func TestCertificates(t *testing.T) {
}
`,
certificateOverride: "",
expected: "build/target/product/security/expiredkey.x509.pem build/target/product/security/expiredkey.pk8",
expected: "build/make/target/product/security/expiredkey.x509.pem build/make/target/product/security/expiredkey.pk8",
},
{
name: "certificate overrides",
@@ -910,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/expiredkey.x509.pem build/target/product/security/expiredkey.pk8",
signFlag: "build/make/target/product/security/expiredkey.x509.pem build/make/target/product/security/expiredkey.pk8",
overrides: []string{"baz"},
aaptFlag: "",
},
@@ -924,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/expiredkey.x509.pem build/target/product/security/expiredkey.pk8",
signFlag: "build/make/target/product/security/expiredkey.x509.pem build/make/target/product/security/expiredkey.pk8",
overrides: []string{"baz", "foo"},
aaptFlag: "--rename-manifest-package org.dandroid.bp",
},