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

Commit 411a98a9 authored by Jaewoong Jung's avatar Jaewoong Jung Committed by Gerrit Code Review
Browse files

Merge "Export the cert path for runtime_resource_overlay."

parents db84575f 78ec5d8d

java/androidmk.go

+2 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries { 


				entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", app.Privileged())



				entries.SetPath("LOCAL_CERTIFICATE", app.certificate.Pem)

				entries.SetString("LOCAL_CERTIFICATE", app.certificate.AndroidMkString())

				entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", app.getOverriddenPackages()...)



				for _, jniLib := range app.installJniLibs {
@@ -699,6 +699,7 @@ func (r *RuntimeResourceOverlay) AndroidMkEntries() []android.AndroidMkEntries { 
		Include:    "$(BUILD_SYSTEM)/soong_app_prebuilt.mk",

		ExtraEntries: []android.AndroidMkExtraEntriesFunc{

			func(entries *android.AndroidMkEntries) {

				entries.SetString("LOCAL_CERTIFICATE", r.certificate.AndroidMkString())

				entries.SetPath("LOCAL_MODULE_PATH", r.installDir.ToMakePath())

			},

		},

java/app.go

+3 −0
Original line number Diff line number Diff line
@@ -1243,6 +1243,8 @@ type RuntimeResourceOverlay struct { 


	properties RuntimeResourceOverlayProperties



	certificate Certificate



	outputFile android.Path

	installDir android.InstallPath

}
@@ -1288,6 +1290,7 @@ func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleC 
	certificates = processMainCert(r.ModuleBase, String(r.properties.Certificate), certificates, ctx)

	signed := android.PathForModuleOut(ctx, "signed", r.Name()+".apk")

	SignAppPackage(ctx, signed, r.aapt.exportPackage, certificates)

	r.certificate = certificates[0]



	r.outputFile = signed

	r.installDir = android.PathForModuleInstall(ctx, "overlay", String(r.properties.Theme))

java/app_test.go

+7 −2
Original line number Diff line number Diff line
@@ -2242,10 +2242,15 @@ func TestRuntimeResourceOverlay(t *testing.T) { 
	if expected != signingFlag {

		t.Errorf("Incorrect signing flags, expected: %q, got: %q", expected, signingFlag)

	}

	path := android.AndroidMkEntriesForTest(t, config, "", m.Module())[0].EntryMap["LOCAL_CERTIFICATE"]

	expectedPath := []string{"build/make/target/product/security/platform.x509.pem"}

	if !reflect.DeepEqual(path, expectedPath) {

		t.Errorf("Unexpected LOCAL_CERTIFICATE value: %v, expected: %v", path, expectedPath)

	}



	// Check device location.

	path := android.AndroidMkEntriesForTest(t, config, "", m.Module())[0].EntryMap["LOCAL_MODULE_PATH"]

	expectedPath := []string{"/tmp/target/product/test_device/product/overlay"}

	path = android.AndroidMkEntriesForTest(t, config, "", m.Module())[0].EntryMap["LOCAL_MODULE_PATH"]

	expectedPath = []string{"/tmp/target/product/test_device/product/overlay"}

	if !reflect.DeepEqual(path, expectedPath) {

		t.Errorf("Unexpected LOCAL_MODULE_PATH value: %v, expected: %v", path, expectedPath)

	}