diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-04-09 21:36:26 -0700 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-09-25 23:30:48 +0300 |
| commit | 195b8ededbceccca41bdafcb8c1e0d2b23c3f42e (patch) | |
| tree | fe7e9cd9144e96903d675a935bf51e0666e9c284 /android | |
| parent | 4987f5ff0888a3009959010fdab05b8a3f79ff3e (diff) | |
| download | build_soong-195b8ededbceccca41bdafcb8c1e0d2b23c3f42e.tar.gz build_soong-195b8ededbceccca41bdafcb8c1e0d2b23c3f42e.tar.bz2 build_soong-195b8ededbceccca41bdafcb8c1e0d2b23c3f42e.zip | |
Stop using build/target -> build/make/target symlink
Instead, fully specify build/make/target/... everywhere
Test: treehugger
Change-Id: I07ba0e9b0604919a271afd5133070616e1f404fc
Diffstat (limited to 'android')
| -rw-r--r-- | android/config.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/config.go b/android/config.go index d1db87b2..0bf6ee31 100644 --- a/android/config.go +++ b/android/config.go @@ -584,7 +584,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") } } @@ -601,7 +601,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) |