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

Commit 1d7b8597 authored Jun 26, 2024 by Makoto Onuki

Remove redundant genrules

The `data` property actually accepts the ":xxx{yyy}" notation, so we
don't need the intermediate genrules.

We still need genrules to extract jars becaause `libs` and `static_libs`
don't understand the notaetion.

Bug: 292141694
Flag: EXEMPTED hostside tool change only
Test: frameworks/base/ravenwood/scripts/ravenwood-stats-collector.sh
  and check the generated files
Change-Id: I7911f2ac733570f829f45148d423a7c5a8f66451

parent 0bf84c39

Ravenwood.bp

+10 −84

Original line number	Diff line number	Diff line
		@@ -38,8 +38,8 @@ java_genrule {

		"--out-impl-jar $(location ravenwood.jar) " +

		"--gen-keep-all-file $(location hoststubgen_keep_all.txt) " +
		"--gen-input-dump-file $(location hoststubgen_dump.txt) " +
		"--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +
		"--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +

		"--in-jar $(location :framework-minus-apex-for-hoststubgen) " +
		"--policy-override-file $(location :ravenwood-framework-policies) " +
		@@ -54,14 +54,14 @@ java_genrule {
		"ravenwood.jar",

		// Following files are created just as FYI.
		"hoststubgen_keep_all.txt",
		"hoststubgen_dump.txt",
		"hoststubgen_framework-minus-apex_keep_all.txt",
		"hoststubgen_framework-minus-apex_dump.txt",

		"hoststubgen_framework-minus-apex.log",
		"hoststubgen_framework-minus-apex_stats.csv",
		"hoststubgen_framework-minus-apex_apis.csv",
		],
		visibility: ["//visibility:private"],
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		}

		// Extract the impl jar from "framework-minus-apex.ravenwood-base" for subsequent build rules.
		@@ -79,43 +79,6 @@ java_genrule {
		],
		}

		// Extract the stats file.
		genrule {
		name: "framework-minus-apex.ravenwood.stats",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":framework-minus-apex.ravenwood-base{hoststubgen_framework-minus-apex_stats.csv}",
		],
		out: [
		"hoststubgen_framework-minus-apex_stats.csv",
		],
		}

		genrule {
		name: "framework-minus-apex.ravenwood.apis",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":framework-minus-apex.ravenwood-base{hoststubgen_framework-minus-apex_apis.csv}",
		],
		out: [
		"hoststubgen_framework-minus-apex_apis.csv",
		],
		}

		genrule {
		name: "framework-minus-apex.ravenwood.keep_all",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":framework-minus-apex.ravenwood-base{hoststubgen_keep_all.txt}",
		],
		out: [
		"hoststubgen_framework-minus-apex_keep_all.txt",
		],
		}

		java_library {
		name: "services.core-for-hoststubgen",
		installable: false, // host only jar.
		@@ -138,8 +101,8 @@ java_genrule {

		"--out-impl-jar $(location ravenwood.jar) " +

		"--gen-keep-all-file $(location hoststubgen_keep_all.txt) " +
		"--gen-input-dump-file $(location hoststubgen_dump.txt) " +
		"--gen-keep-all-file $(location hoststubgen_services.core_keep_all.txt) " +
		"--gen-input-dump-file $(location hoststubgen_services.core_dump.txt) " +

		"--in-jar $(location :services.core-for-hoststubgen) " +
		"--policy-override-file $(location :ravenwood-services-policies) " +
		@@ -154,14 +117,14 @@ java_genrule {
		"ravenwood.jar",

		// Following files are created just as FYI.
		"hoststubgen_keep_all.txt",
		"hoststubgen_dump.txt",
		"hoststubgen_services.core_keep_all.txt",
		"hoststubgen_services.core_dump.txt",

		"hoststubgen_services.core.log",
		"hoststubgen_services.core_stats.csv",
		"hoststubgen_services.core_apis.csv",
		],
		visibility: ["//visibility:private"],
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		}

		java_genrule {
		@@ -176,43 +139,6 @@ java_genrule {
		],
		}

		// Extract the stats file.
		genrule {
		name: "services.core.ravenwood.stats",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":services.core.ravenwood-base{hoststubgen_services.core_stats.csv}",
		],
		out: [
		"hoststubgen_services.core_stats.csv",
		],
		}

		genrule {
		name: "services.core.ravenwood.apis",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":services.core.ravenwood-base{hoststubgen_services.core_apis.csv}",
		],
		out: [
		"hoststubgen_services.core_apis.csv",
		],
		}

		genrule {
		name: "services.core.ravenwood.keep_all",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":services.core.ravenwood-base{hoststubgen_keep_all.txt}",
		],
		out: [
		"hoststubgen_services.core_keep_all.txt",
		],
		}

		java_library {
		name: "services.core.ravenwood-jarjar",
		defaults: ["ravenwood-internal-only-visibility-java"],

ravenwood/Android.bp

+8 −6

Original line number	Diff line number	Diff line
		@@ -274,12 +274,14 @@ sh_test_host {
		src: "scripts/ravenwood-stats-checker.sh",
		test_suites: ["general-tests"],
		data: [
		":framework-minus-apex.ravenwood.stats",
		":framework-minus-apex.ravenwood.apis",
		":framework-minus-apex.ravenwood.keep_all",
		":services.core.ravenwood.stats",
		":services.core.ravenwood.apis",
		":services.core.ravenwood.keep_all",
		":framework-minus-apex.ravenwood-base{hoststubgen_framework-minus-apex_stats.csv}",
		":framework-minus-apex.ravenwood-base{hoststubgen_framework-minus-apex_apis.csv}",
		":framework-minus-apex.ravenwood-base{hoststubgen_framework-minus-apex_keep_all.txt}",
		":framework-minus-apex.ravenwood-base{hoststubgen_framework-minus-apex_dump.txt}",
		":services.core.ravenwood-base{hoststubgen_services.core_stats.csv}",
		":services.core.ravenwood-base{hoststubgen_services.core_apis.csv}",
		":services.core.ravenwood-base{hoststubgen_services.core_keep_all.txt}",
		":services.core.ravenwood-base{hoststubgen_services.core_dump.txt}",
		],
		}

ravenwood/scripts/ravenwood-stats-collector.sh

+7 −1

Original line number	Diff line number	Diff line
		@@ -22,10 +22,12 @@ out_dir=/tmp/ravenwood
		stats=$out_dir/ravenwood-stats-all.csv
		apis=$out_dir/ravenwood-apis-all.csv
		keep_all_dir=$out_dir/ravenwood-keep-all/
		dump_dir=$out_dir/ravenwood-dump/

		rm -fr $out_dir
		mkdir -p $out_dir
		mkdir -p $keep_all_dir
		mkdir -p $dump_dir

		# Where the input files are.
		path=$ANDROID_BUILD_TOP/out/host/linux-x86/testcases/ravenwood-stats-checker/x86_64/
		@@ -86,3 +88,7 @@ collect_apis $apis
		cp *keep_all.txt $keep_all_dir
		echo "Keep all files created at:"
		find $keep_all_dir -type f

		cp *dump.txt $dump_dir
		echo "Dump files created at:"
		find $dump_dir -type f
		No newline at end of file