tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/config.go
View file

@ -583,7 +583,7 @@ func (c *config) DefaultAppCertificateDir(ctx PathContext) SourcePath {
if defaultCert != "" {
return PathForSource(ctx, filepath.Dir(defaultCert))
} else {
return PathForSource(ctx, "build/target/product/security")
return PathForSource(ctx, "build/make/target/product/security")
}
}
@ -600,7 +600,7 @@ func (c *config) DefaultAppCertificate(ctx PathContext) (pem, key SourcePath) {
func (c *config) ApexKeyDir(ctx ModuleContext) SourcePath {
// TODO(b/121224311): define another variable such as TARGET_APEX_KEY_OVERRIDE
defaultCert := String(c.productVariables.DefaultAppCertificate)
if defaultCert == "" || filepath.Dir(defaultCert) == "build/target/product/security" {
if defaultCert == "" || filepath.Dir(defaultCert) == "build/make/target/product/security" {
// When defaultCert is unset or is set to the testkeys path, use the APEX keys
// that is under the module dir
return pathForModuleSrc(ctx)

2
apex/apex_test.go
View file

@ -148,7 +148,7 @@ func testApex(t *testing.T, bp string) *android.TestContext {
ctx.MockFileSystem(map[string][]byte{
"Android.bp": []byte(bp),
"build/target/product/security": nil,
"build/make/target/product/security": nil,
"apex_manifest.json": nil,
"AndroidManifest.xml": nil,
"system/sepolicy/apex/myapex-file_contexts": nil,

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",
},

4
java/java_test.go
View file

@ -163,8 +163,8 @@ func testContext(config android.Config, bp string,
"prebuilts/sdk/Android.bp": []byte(`prebuilt_apis { name: "sdk", api_dirs: ["14", "28", "current"],}`),
// For framework-res, which is an implicit dependency for framework
"AndroidManifest.xml": nil,
"build/target/product/security/testkey": nil,
"AndroidManifest.xml": nil,
"build/make/target/product/security/testkey": nil,
"build/soong/scripts/jar-wrapper.sh": nil,

4
sysprop/sysprop_test.go
View file

@ -135,8 +135,8 @@ func testContext(config android.Config, bp string,
"prebuilts/sdk/Android.bp": []byte(`prebuilt_apis { name: "sdk", api_dirs: ["28", "current"],}`),
// For framework-res, which is an implicit dependency for framework
"AndroidManifest.xml": nil,
"build/target/product/security/testkey": nil,
"AndroidManifest.xml": nil,
"build/make/target/product/security/testkey": nil,
"build/soong/scripts/jar-wrapper.sh": nil,