Merge "Incorporate Bazel-built fingerprint file into mixed builds" (f20a5265) · Commits · e / os / android_build_soong

android/allowlists/allowlists.go

+6 −1

Original line number	Diff line number	Diff line
		@@ -695,6 +695,9 @@ var (
		"non-updatable-system-current.txt",
		"non-updatable-module-lib-current.txt",
		"non-updatable-system-server-current.txt",

		// for api_fingerprint.txt generation
		"api_fingerprint",
		}

		Bp2buildModuleTypeAlwaysConvertList = []string{
		@@ -1436,7 +1439,9 @@ var (
		// which will soon be added to the prod allowlist.
		// It is implicit that all modules in ProdMixedBuildsEnabledList will
		// also be built - do not add them to this list.
		StagingMixedBuildsEnabledList = []string{}
		StagingMixedBuildsEnabledList = []string{
		"api_fingerprint",
		}

		// These should be the libs that are included by the apexes in the ProdMixedBuildsEnabledList
		ProdDclaMixedBuildsEnabledList = []string{}

+3 −6

Original line number	Diff line number	Diff line
		@@ -384,10 +384,7 @@ func createAPIFingerprint(ctx android.SingletonContext) {
		} else if ctx.Config().FrameworksBaseDirExists(ctx) && !ctx.Config().AlwaysUsePrebuiltSdks() {
		cmd.Text("cat")
		apiTxtFileModules := []string{
		"frameworks-base-api-current.txt",
		"frameworks-base-api-system-current.txt",
		"frameworks-base-api-module-lib-current.txt",
		"frameworks-base-api-system-server-current.txt",
		"api_fingerprint",
		}
		count := 0
		ctx.VisitAllModules(func(module android.Module) {
		@@ -398,10 +395,10 @@ func createAPIFingerprint(ctx android.SingletonContext) {
		}
		})
		if count != len(apiTxtFileModules) {
		ctx.Errorf("Could not find all the expected API modules %v, found %d\n", apiTxtFileModules, count)
		ctx.Errorf("Could not find expected API module %v, found %d\n", apiTxtFileModules, count)
		return
		}
		cmd.Text("\| md5sum \| cut -d' ' -f1 >").
		cmd.Text(">").
		Output(out)
		} else {
		// Unbundled build