diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-04-09 21:36:26 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2019-04-09 21:36:26 -0700 |
| commit | 412160e1c9d7fe88496474ea98103bb670317731 (patch) | |
| tree | 8fbd43268fd786a693d0177ee1b8559eadcc1a1c | |
| parent | c4bd8f82826840e7921bc512b2557e0c39bad068 (diff) | |
| download | build_soong-412160e1c9d7fe88496474ea98103bb670317731.tar.gz build_soong-412160e1c9d7fe88496474ea98103bb670317731.tar.bz2 build_soong-412160e1c9d7fe88496474ea98103bb670317731.zip | |
Stop using build/target -> build/make/target symlink
Instead, fully specify build/make/target/... everywhere
Test: treehugger
Change-Id: I07ba0e9b0604919a271afd5133070616e1f404fc
| -rw-r--r-- | android/config.go | 4 | ||||
| -rw-r--r-- | apex/apex_test.go | 2 | ||||
| -rw-r--r-- | java/app_test.go | 8 | ||||
| -rw-r--r-- | java/java_test.go | 4 | ||||
| -rw-r--r-- | sysprop/sysprop_test.go | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/android/config.go b/android/config.go index 84dd66fd..0c9f9576 100644 --- a/android/config.go +++ b/android/config.go @@ -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) diff --git a/apex/apex_test.go b/apex/apex_test.go index 3c80376d..fce21356 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -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, diff --git a/java/app_test.go b/java/app_test.go index 1f6297c2..a084c9cc 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -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", }, diff --git a/java/java_test.go b/java/java_test.go index 2546698b..3ae993d2 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -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, diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go index a7aff59e..af89c242 100644 --- a/sysprop/sysprop_test.go +++ b/sysprop/sysprop_test.go @@ -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, |