From f4d8b9c2cb74b96df8e5e9b937c6dbd13b0ba03c Mon Sep 17 00:00:00 2001 From: Dario Freni Date: Fri, 26 Apr 2024 18:06:11 +0000 Subject: Remove aapt2_results. This rule was introduced in 2017 as a way to run unit tests in a continuous build target. We have better ways to achieve the same today. Bug: 337281646 Bug: 332609042 Test: presubmit Change-Id: Iba9934f39df2ebb883ded941d438b3528b3f29c2 --- tools/aapt2/Android.bp | 53 -------------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp index 994adc91a70c..4c8193990feb 100644 --- a/tools/aapt2/Android.bp +++ b/tools/aapt2/Android.bp @@ -227,56 +227,3 @@ genrule { ], }, } - -cc_genrule { - name: "aapt2_results", - srcs: [ - ":aapt2_tests", - "integration-tests/CompileTest/**/*", - "integration-tests/CommandTests/**/*", - "integration-tests/ConvertTest/**/*", - "integration-tests/DumpTest/**/*", - ], - host_supported: true, - device_supported: false, - target: { - windows: { - compile_multilib: "64", - }, - }, - out: ["result.xml"], - cmd: "mkdir -p $(genDir)/integration-tests/CompileTest/ && " + - "cp $(locations integration-tests/CompileTest/**/*) $(genDir)/integration-tests/CompileTest/ && " + - "mkdir -p $(genDir)/integration-tests/CommandTests/ && " + - "cp $(locations integration-tests/CommandTests/**/*) $(genDir)/integration-tests/CommandTests/ && " + - "mkdir -p $(genDir)/integration-tests/ConvertTest/ && " + - "cp $(locations integration-tests/ConvertTest/**/*) $(genDir)/integration-tests/ConvertTest/ && " + - "mkdir -p $(genDir)/integration-tests/DumpTest/ && " + - "cp $(locations integration-tests/DumpTest/**/*) $(genDir)/integration-tests/DumpTest/ && " + - "cp $(locations :aapt2_tests) $(genDir)/ && " + - "$(genDir)/aapt2_tests " + - "--gtest_output=xml:$(out) " + - ">/dev/null 2>&1 ; true", - dist: { - targets: ["aapt2_run_host_unit_tests"], - dir: "gtest", - dest: "aapt2_host_unit_tests_result.xml", - }, - arch: { - x86: { - dist: { - suffix: "_x86", - }, - }, - x86_64: { - dist: { - suffix: "_x86_64", - }, - }, - }, -} - -phony_rule { - name: "aapt2_run_host_unit_tests", - phony_deps: ["aapt2_results"], -} -- cgit v1.2.3