Skip to content

Commit

Permalink
Add gradle clean up step
Browse files Browse the repository at this point in the history
Change-Id: Ica6b7a17a1d3c7ad77025c6a954070c7acf139d9
  • Loading branch information
oxve committed Jun 13, 2024
1 parent e2c32bb commit 208a604
Showing 1 changed file with 23 additions and 5 deletions.
28 changes: 23 additions & 5 deletions starboard/android/shared/install_target.gni
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ template("install_target") {
not_needed(invoker, [ "type" ])

installable_target_name = invoker.installable_target_name
target_output = "$root_out_dir/lib${installable_target_name}.so"
gradle_content_dir = "$sb_install_output_dir/$installable_target_name/$sb_install_content_subdir"
gradle_files_dir = "$root_out_dir/gradle/$installable_target_name"

action("build_${target_name}_apk") {
forward_variables_from(invoker, [ "testonly" ])

deps = invoker.deps
deps += [ ":$installable_target_name" ]

target_output = "$root_out_dir/lib${installable_target_name}.so"
gradle_content_dir = "$sb_install_output_dir/$installable_target_name/$sb_install_content_subdir"
gradle_files_dir = "$root_out_dir/gradle/$installable_target_name"
if (is_gold) {
gradle_build_type = "release"
} else {
Expand Down Expand Up @@ -93,9 +93,26 @@ template("install_target") {
"-P",
"evergreenCompatible=$sb_is_evergreen_compatible",
"assembleCobalt_$gradle_build_type",
"-Dorg.gradle.daemon=$use_parallel_build",
"-Dorg.gradle.parallel=$use_parallel_build",
"-Dorg.gradle.workers.max=$num_gradle_workers",
"-Dorg.gradle.workers.parallel=$use_parallel_build",
"-Dorg.gradle.workers.daemon=$use_parallel_build",
]
}

action("clean_${target_name}_gradle_files") {
forward_variables_from(invoker, [ "testonly" ])

deps = [ ":build_${invoker.target_name}_apk" ]

# TODO: Fake output.
outputs =
[ "${target_out_dir}/${target_name}-${invoker.target_name}.stamp" ]

script = "//starboard/build/run_bash.py"
args = [
"rm",
"-rf",
rebase_path(gradle_files_dir),
]
}

Expand All @@ -104,6 +121,7 @@ template("install_target") {
deps = [
":$installable_target_name",
":build_${target_name}_apk",
":clean_${target_name}_gradle_files",
]
}
}

0 comments on commit 208a604

Please sign in to comment.