Merge "Add Script to collect ravenwood stats *.csv files" into main (57636844) · Commits · e / os / android_frameworks_base

Ravenwood.bp

+12 −12

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ java_genrule {
		name: "framework-minus-apex.ravenwood-base",
		tools: ["hoststubgen"],
		cmd: "$(location hoststubgen) " +
		"@$(location ravenwood/ravenwood-standard-options.txt) " +
		"@$(location ravenwood/texts/ravenwood-standard-options.txt) " +

		"--debug-log $(location hoststubgen_framework-minus-apex.log) " +
		"--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +
		@@ -41,13 +41,13 @@ java_genrule {
		"--gen-input-dump-file $(location hoststubgen_dump.txt) " +

		"--in-jar $(location :framework-minus-apex-for-hoststubgen) " +
		"--policy-override-file $(location ravenwood/framework-minus-apex-ravenwood-policies.txt) " +
		"--annotation-allowed-classes-file $(location ravenwood/ravenwood-annotation-allowed-classes.txt) ",
		"--policy-override-file $(location ravenwood/texts/framework-minus-apex-ravenwood-policies.txt) " +
		"--annotation-allowed-classes-file $(location ravenwood/texts/ravenwood-annotation-allowed-classes.txt) ",
		srcs: [
		":framework-minus-apex-for-hoststubgen",
		"ravenwood/framework-minus-apex-ravenwood-policies.txt",
		"ravenwood/ravenwood-standard-options.txt",
		"ravenwood/ravenwood-annotation-allowed-classes.txt",
		"ravenwood/texts/framework-minus-apex-ravenwood-policies.txt",
		"ravenwood/texts/ravenwood-standard-options.txt",
		"ravenwood/texts/ravenwood-annotation-allowed-classes.txt",
		],
		out: [
		"ravenwood.jar",
		@@ -104,7 +104,7 @@ java_genrule {
		name: "services.core.ravenwood-base",
		tools: ["hoststubgen"],
		cmd: "$(location hoststubgen) " +
		"@$(location ravenwood/ravenwood-standard-options.txt) " +
		"@$(location ravenwood/texts/ravenwood-standard-options.txt) " +

		"--debug-log $(location hoststubgen_services.core.log) " +
		"--stats-file $(location hoststubgen_services.core_stats.csv) " +
		@@ -115,13 +115,13 @@ java_genrule {
		"--gen-input-dump-file $(location hoststubgen_dump.txt) " +

		"--in-jar $(location :services.core-for-hoststubgen) " +
		"--policy-override-file $(location ravenwood/services.core-ravenwood-policies.txt) " +
		"--annotation-allowed-classes-file $(location ravenwood/ravenwood-annotation-allowed-classes.txt) ",
		"--policy-override-file $(location ravenwood/texts/services.core-ravenwood-policies.txt) " +
		"--annotation-allowed-classes-file $(location ravenwood/texts/ravenwood-annotation-allowed-classes.txt) ",
		srcs: [
		":services.core-for-hoststubgen",
		"ravenwood/services.core-ravenwood-policies.txt",
		"ravenwood/ravenwood-standard-options.txt",
		"ravenwood/ravenwood-annotation-allowed-classes.txt",
		"ravenwood/texts/services.core-ravenwood-policies.txt",
		"ravenwood/texts/ravenwood-standard-options.txt",
		"ravenwood/texts/ravenwood-annotation-allowed-classes.txt",
		],
		out: [
		"ravenwood.jar",

ravenwood/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ java_device_for_host {

		filegroup {
		name: "ravenwood-services-jarjar-rules",
		srcs: ["ravenwood-services-jarjar-rules.txt"],
		srcs: ["texts/ravenwood-services-jarjar-rules.txt"],
		visibility: ["//frameworks/base"],
		}

		@@ -159,7 +159,7 @@ filegroup {
		// The "test" just shows the available stats filenames.
		sh_test_host {
		name: "ravenwood-stats-checker",
		src: "ravenwood-stats-checker.sh",
		src: "scripts/ravenwood-stats-checker.sh",
		test_suites: ["general-tests"],
		data: [
		":framework-minus-apex.ravenwood.stats",

ravenwood/ravenwood-stats-checker.sh

deleted100755 → 0

+0 −5

Original line number	Diff line number	Diff line
		#!/bin/bash

		# Just print the available *.csv filenames.
		echo '#Stats files:'
		ls *.csv
		No newline at end of file

ravenwood/bulk_enable.py→ravenwood/scripts/bulk_enable.py

+0 −0

File moved.

View file

ravenwood/fix_test_runner.py→ravenwood/scripts/fix_test_runner.py

+0 −0

File moved.

View file