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

Commit 748ade2f authored by Yu Liu's avatar Yu Liu
Browse files

Add dedup flag to aconfig dump-cache calls. 

Bug: None
Test: CI
Change-Id: I34a73576a7a7ea43178895049a0f7dbcd9e329bc
parent 55a829d7

aconfig/init.go

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ var ( 
	// For create-device-config-sysprops: Generate aconfig flag value map text file

	aconfigTextRule = pctx.AndroidStaticRule("aconfig_text",

		blueprint.RuleParams{

			Command: `${aconfig} dump-cache --format='{fully_qualified_name}={state:bool}'` +

			Command: `${aconfig} dump-cache --dedup --format='{fully_qualified_name}={state:bool}'` +

				` --cache ${in}` +

				` --out ${out}.tmp` +

				` && ( if cmp -s ${out}.tmp ${out} ; then rm ${out}.tmp ; else mv ${out}.tmp ${out} ; fi )`,
@@ -56,7 +56,7 @@ var ( 
	// For all_aconfig_declarations: Combine all parsed_flags proto files

	AllDeclarationsRule = pctx.AndroidStaticRule("All_aconfig_declarations_dump",

		blueprint.RuleParams{

			Command: `${aconfig} dump-cache --format protobuf --out ${out} ${cache_files}`,

			Command: `${aconfig} dump-cache --dedup --format protobuf --out ${out} ${cache_files}`,

			CommandDeps: []string{

				"${aconfig}",

			},
@@ -73,7 +73,7 @@ var ( 
		blueprint.RuleParams{

			Command: `rm -rf ${out}.tmp` +

				`&& for cache in ${cache_files}; do ` +

				`  if [ -n "$$(${aconfig} dump-cache --cache $$cache --filter=is_exported:true --format='{fully_qualified_name}')" ]; then ` +

				`  if [ -n "$$(${aconfig} dump-cache --dedup --cache $$cache --filter=is_exported:true --format='{fully_qualified_name}')" ]; then ` +

				`    ${aconfig} create-java-lib --cache $$cache --mode=exported --out ${out}.tmp; ` +

				`  fi ` +

				`done` +

java/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ var ( 


	gatherReleasedFlaggedApisRule = pctx.AndroidStaticRule("gatherReleasedFlaggedApisRule",

		blueprint.RuleParams{

			Command: `${aconfig} dump-cache --format='{fully_qualified_name}={state:bool}' ` +

			Command: `${aconfig} dump-cache --dedup --format='{fully_qualified_name}={state:bool}' ` +

				`--out ${out} ` +

				`${flags_path} ` +

				`${filter_args} `,