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

Commit 7e2b36c7 authored by Colin Cross's avatar Colin Cross
Browse files

Set LOCAL_APKCERTS_FILE for apk_set modules in apexes 

I321e80fd636a955213761f56a3ac64bfe7f7f7c0 missed setting
LOCAL_APKCERTS_FILE for apk_set modules in apexes, which causes
invalid apkcerts.txt files.

Bug: 160652723
Test: m apkcerts-list
Change-Id: I1ccaafd04978374d0da10363a1d782cfeae428e7
parent 03f3a9c1

apex/androidmk.go

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 
				panic(fmt.Sprintf("Expected %s to be AndroidAppSet", fi.module))

			}

			fmt.Fprintln(w, "LOCAL_APK_SET_MASTER_FILE :=", as.MasterFile())

			fmt.Fprintln(w, "LOCAL_APKCERTS_FILE :=", as.APKCertsFile().String())

			fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_android_app_set.mk")

		case nativeSharedLib, nativeExecutable, nativeTest:

			fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.Stem())

java/app.go

+4 −0
Original line number Diff line number Diff line
@@ -105,6 +105,10 @@ func (as *AndroidAppSet) MasterFile() string { 
	return as.masterFile

}



func (as *AndroidAppSet) APKCertsFile() android.Path {

	return as.apkcertsFile

}



var TargetCpuAbi = map[string]string{

	"arm":    "ARMEABI_V7A",

	"arm64":  "ARM64_V8A",