Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 412160e1 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

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

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

Test: treehugger
Change-Id: I07ba0e9b0604919a271afd5133070616e1f404fc
parent c4bd8f82

android/config.go

+2 −2
Original line number Diff line number Diff line
@@ -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)

apex/apex_test.go

+1 −1
Original line number Diff line number Diff line
@@ -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,

java/app_test.go

+4 −4
Original line number Diff line number Diff line
@@ -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",

		},

java/java_test.go

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ func testContext(config android.Config, bp string, 


		// For framework-res, which is an implicit dependency for framework

		"AndroidManifest.xml":                        nil,

		"build/target/product/security/testkey": nil,

		"build/make/target/product/security/testkey": nil,



		"build/soong/scripts/jar-wrapper.sh": nil,

sysprop/sysprop_test.go

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ func testContext(config android.Config, bp string, 


		// For framework-res, which is an implicit dependency for framework

		"AndroidManifest.xml":                        nil,

		"build/target/product/security/testkey": nil,

		"build/make/target/product/security/testkey": nil,



		"build/soong/scripts/jar-wrapper.sh": nil,