From 5520025d6c4bfdee6b0964195cf7a542d68be278 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Wed, 27 Apr 2022 04:35:43 -0400
Subject: [PATCH] Clean up Android test jars (#17776)

This step is

1) Building files in /tmp which isn't desirable, we should use the
   output dir
2) Dirtying the inputs every time the script runs, causing
   unnecessary rebuilds.
3) Not integrated with the bootstrap which is the expected place
   to run setup steps.

These "prebuilt" test jars are smaller than most C++ sources. Just check
them in and remove this extra step.

After we get the expected "No work to do" from ninja the second time an
Android build is run.
---
 build/chip/java/tests/BUILD.gn                |   4 +-
 build/chip/java/tests/child_jar.jar           | Bin 0 -> 1497 bytes
 .../chip/java/tests/generate_jars_for_test.py |   2 +-
 build/chip/java/tests/prebuilt_jar.jar        | Bin 0 -> 1497 bytes
 build/chip/java/tests/test.py                 |   5 +-
 gn_build.sh                                   |   1 -
 scripts/build/builders/android.py             |   4 --
 .../build/testdata/build_all_except_host.txt  |  45 ------------------
 scripts/examples/android_app_ide.sh           |   1 -
 scripts/examples/gn_android_example.sh        |   2 -
 10 files changed, 4 insertions(+), 60 deletions(-)
 create mode 100644 build/chip/java/tests/child_jar.jar
 create mode 100644 build/chip/java/tests/prebuilt_jar.jar

diff --git a/build/chip/java/tests/BUILD.gn b/build/chip/java/tests/BUILD.gn
index a782edc7740d84..d5e97c02315af0 100644
--- a/build/chip/java/tests/BUILD.gn
+++ b/build/chip/java/tests/BUILD.gn
@@ -54,10 +54,10 @@ java_library("grandchild_library") {
 }
 
 java_prebuilt("java_prebuilt") {
-  jar_path = "/tmp/chip_java_build_test/prebuilt_jar.jar"
+  jar_path = "prebuilt_jar.jar"
   deps = [ ":child_prebuilt" ]
 }
 
 java_prebuilt("child_prebuilt") {
-  jar_path = "/tmp/chip_java_build_test/child_jar.jar"
+  jar_path = "child_jar.jar"
 }
diff --git a/build/chip/java/tests/child_jar.jar b/build/chip/java/tests/child_jar.jar
new file mode 100644
index 0000000000000000000000000000000000000000..343c0b4eef036a1764cb0c807280d9202f814c47
GIT binary patch
literal 1497
zcmWIWW@Zs#;Nak3Sl=@%gaHX~GO#fCx`sIFdiuHP|2xINz|0Wf&CUT*!30$nfK#&w
zPz7AGucM!*n`>~0p0C?y-!rFuymj?1@_OrPojY@WbCAIm;|EWR^t^m^Jbf>gu43Vg
zcp-U2T2fjwW5*J;RJCWBpNc*fF@mi=H*e7^OQ69Z46>SwfdS~8ax{0d0cDd)Gjme(
zajW5mt4YqtEWo2s099dDVp$>{)nZswm!uY#6od6Zf_WX9b2V}5@ytukDNRXD@yzo|
zEYeHPNh~h5{+fT?j*X2?n5|BaEsagCj4iH=&CZQ&;h8;8=3JU`MdZBA^PV$vMAjcs
za%0n-za&T@+TK!mvxB|%MxDU@DqD9fiMTK9yw+5idA4s_Tw15BGV|uPGzn$q?&3Nx
zEoJ8Y{%LWm;xqGtvI0Glg7^Yjv@P~;(XhO#D||%INrKhHl|O}@pIMsOTDjRsarHqx
z5eDz4D$ka_{;i(6RBgI}hLHi|-=hZ(a2(O$S(6~9e8NNFB;%8lO+R^f)<oTwlrV2v
zYT2kF9Wg=Dqlht6jV%uxt=AV#^SlTQ1r0_>v|>+=dPIbia|STl;enOf=g5E1L7?@1
z)>e^+&z?MJYu;<o<t^;#Y9a9bZP{V7txKZ*pZ0w8fc-~c(ynmhle71{PgVQ;bKgCN
zv==M|0zWc-W*Ao#=ay_tC~$ks+$<d@bo4@O_F}WAmSI2Rjz~^SDAz1rIc=BG-xDX+
z_=E_}{IFzmit49Kt#^xf#Y@`)V}zc3TC#r6p*;cHA07KYU82hDe2e9$+&Nm22^~^@
z!$lV_t6n0vv+=7#?I)J%8#mOy>Xdj$n`CGF0|$z|gZjsvKrg=l;s9?(CJ_eIV1Z>p
zP%cFU@N5Ulv*=opvk)kcB7iNB3D=60V?icxG2qT>2orVynXrt9TMsDfA;29V6QT#2
z5pin-Wkm#F1tu0GjnIsVTQ?|cB7iX#-LQ;`2y0MQMNXWctcn2XIL*M4ana)eIeI}U
k8v*)(F^ldoh|>_pqNeizZ&py52P_LY803MvmoS5P0HiyL{r~^~

literal 0
HcmV?d00001

diff --git a/build/chip/java/tests/generate_jars_for_test.py b/build/chip/java/tests/generate_jars_for_test.py
index 0c6f954bbd012e..9e81e08eefaea2 100644
--- a/build/chip/java/tests/generate_jars_for_test.py
+++ b/build/chip/java/tests/generate_jars_for_test.py
@@ -33,7 +33,7 @@ def generateJar(source_file, output_name):
         'python3',
         chip_root + '/build/chip/java/jar_runner.py',
         'cf',
-        tmp_dir + '/' + output_name,
+        test_dir + '/' + output_name,
         '-C',
         tmp_classes_dir,
         '.',
diff --git a/build/chip/java/tests/prebuilt_jar.jar b/build/chip/java/tests/prebuilt_jar.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7bd91331dcf5344202c9437142224ea787e332ff
GIT binary patch
literal 1497
zcmWIWW@Zs#;Nak3Sl2TvgaHX~GO#fCx`sIFdiuHP|2xINz|0Wf&CUT*!30$nfK#&w
zPz7AGucM!*n`>~0p0C?y-!rFuymj?1@_OrPojY@WbCAIm;|EWR^t^m^Jbf>gu43Vg
zcp-U2T2fjwW5*J;RJCWBpNc*fF@mi=H*e7^OQ69Z46>SwfdS~8ax{0d0cDd)Gjme(
zajW5mt4YqtEWo2s099dDVp$>{)nZswm!uY#6od6(4`xlAdOY)zb4pWEQ#|v$5{vYb
za}tY-t-t19w_{^t6K1Q^V@qR`D`Sf*W3zK(TX<&AlR1~BToE~M^StNG9Fg@$l-$^K
z=PwCTh_<&>-t1tny-_D{zslAfOCs(IJFhiWW}fYv7MIp3tIWK)Elon1xx2W|OG}w~
zzkgcXs`$*jpsYZTq#(Y47Hy0DTQn@M>Ixqbbdq2-apg~8=Vz8?wpMO7Qe1sdPlUny
zsmimZuYaqjE>)XupkZXd`1k060~|+mc-AC{DWC9AILY|rWYbR`o;6XoB_+(8mRdHd
zNJmVN^eAG?RAb8nN9*-P(>yN%LqUTP60O+7Nsowda?SuoJ3O#b`yBZXItaAh&)O>T
z@Y$0GZOwZvy1a!wT`dH@zb!j#wslF=|I?n29<cuiOxhK0d~)`l_o-^1f9|`-koJP5
zK;TEl&kW;=;@pyr2?cJCnVY5KgpOW_&0cKw)H3X6+!4u%3FVr_E2r%;`g`KU8lMoM
znID#HPEq}osr7CVuXt%&V2sd{PfOPCIkYEW`=ew3r%P0soo})HlsiW&GND82Z@B2<
zWz|dMb~b)>sQtuJedC7uSDg|MX_M@Xf8ao|cToSh6X@j^Kpf!B$Rxsm8Z59Z2+F0X
z0G{nYc@|wOaux#RQ3S9BGT~a0axBOME(Y9L4Pn9#AQP7HaO(kOJp{M|WJ2^nGa_z{
zpsa`htiZ&Aq!F4iaq9+UO$0E;q8pY`QNtQJae}fc0;J<K153t5j|b%F1*L2R=m*9u
fy2l_+Ll}#i&I7zzL1iAWEaYI22kKtJ4B`O*ksXTo

literal 0
HcmV?d00001

diff --git a/build/chip/java/tests/test.py b/build/chip/java/tests/test.py
index 4f8939284dcf87..4beff28bf03175 100755
--- a/build/chip/java/tests/test.py
+++ b/build/chip/java/tests/test.py
@@ -14,8 +14,7 @@
 # limitations under the License.
 
 """
-Test for GN Java build rules. This test should be executed using ninja, and
-generate_jars_for_test.py should have been called before running this test.
+Test for GN Java build rules. This test should be executed using ninja.
 """
 
 import json
@@ -33,8 +32,6 @@ class JavaBuildTest(unittest.TestCase):
     jars_dir = 'python/lib' + local_test_dir
     configs_dir = 'python/gen' + local_test_dir
 
-    tmp_dir = '/tmp/chip_java_build_test'
-
     # Target names in the BUILD.gn
     targets_to_check = [
         'java_library',
diff --git a/gn_build.sh b/gn_build.sh
index 12213224adbf6f..d2fd46edc7d3a0 100755
--- a/gn_build.sh
+++ b/gn_build.sh
@@ -114,7 +114,6 @@ for arg; do
 done
 
 # Android prebuilt JAR setup
-python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Android SDK setup
diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py
index 6653cd88f6a7a3..fc7db0bbb88ed1 100644
--- a/scripts/build/builders/android.py
+++ b/scripts/build/builders/android.py
@@ -256,10 +256,6 @@ def gradlewBuildExampleAndroid(self):
                 title='Building Example ' + self.identifier)
 
     def generate(self):
-        self._Execute([
-            'python3', 'build/chip/java/tests/generate_jars_for_test.py'
-        ], title='Generating JARs for Java build rules test')
-
         self._Execute([
             'python3', 'third_party/android_deps/set_up_android_deps.py'
         ], title='Setting up Android deps through Gradle')
diff --git a/scripts/build/testdata/build_all_except_host.txt b/scripts/build/testdata/build_all_except_host.txt
index d0a931a883877b..4d5876197e8b76 100644
--- a/scripts/build/testdata/build_all_except_host.txt
+++ b/scripts/build/testdata/build_all_except_host.txt
@@ -10,9 +10,6 @@ bash -c '$AMEBA_PATH/project/realtek_amebaD_va0_example/GCC-RELEASE/build.sh {ro
 # Generating ameba-amebad-pigweed
 bash -c '$AMEBA_PATH/project/realtek_amebaD_va0_example/GCC-RELEASE/build.sh -r {root} ninja {out}/ameba-amebad-pigweed pigweed-app'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -22,9 +19,6 @@ gn gen --check --fail-on-unused-args {out}/android-androidstudio-arm-chip-tool '
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -34,9 +28,6 @@ gn gen --check --fail-on-unused-args {out}/android-androidstudio-arm64-chip-tool
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -46,9 +37,6 @@ gn gen --check --fail-on-unused-args {out}/android-androidstudio-x64-chip-tool '
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -58,9 +46,6 @@ gn gen --check --fail-on-unused-args {out}/android-androidstudio-x86-chip-tool '
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -70,9 +55,6 @@ gn gen --check --fail-on-unused-args {out}/android-arm-chip-tool '--args=target_
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -82,9 +64,6 @@ gn gen --check --fail-on-unused-args {out}/android-arm-chip-tv-casting-app '--ar
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -94,9 +73,6 @@ gn gen --check --fail-on-unused-args {out}/android-arm-chip-tvserver '--args=tar
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -106,9 +82,6 @@ gn gen --check --fail-on-unused-args {out}/android-arm64-chip-test '--args=targe
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -118,9 +91,6 @@ gn gen --check --fail-on-unused-args {out}/android-arm64-chip-tool '--args=targe
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -130,9 +100,6 @@ gn gen --check --fail-on-unused-args {out}/android-arm64-chip-tv-casting-app '--
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -142,9 +109,6 @@ gn gen --check --fail-on-unused-args {out}/android-arm64-chip-tvserver '--args=t
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -154,9 +118,6 @@ gn gen --check --fail-on-unused-args {out}/android-x64-chip-tool '--args=target_
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -166,9 +127,6 @@ gn gen --check --fail-on-unused-args {out}/android-x64-chip-tvserver '--args=tar
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
@@ -178,9 +136,6 @@ gn gen --check --fail-on-unused-args {out}/android-x86-chip-tool '--args=target_
 # Accepting NDK licenses @ tools
 bash -c 'yes | TEST_ANDROID_HOME/tools/bin/sdkmanager --licenses >/dev/null'
 
-# Generating JARs for Java build rules test
-python3 build/chip/java/tests/generate_jars_for_test.py
-
 # Setting up Android deps through Gradle
 python3 third_party/android_deps/set_up_android_deps.py
 
diff --git a/scripts/examples/android_app_ide.sh b/scripts/examples/android_app_ide.sh
index b5a221bce121b5..6e8a88605629ad 100755
--- a/scripts/examples/android_app_ide.sh
+++ b/scripts/examples/android_app_ide.sh
@@ -38,7 +38,6 @@ fi
 source scripts/activate.sh
 
 # Set up JARs
-python3 build/chip/java/tests/generate_jars_for_test.py
 python3 third_party/android_deps/set_up_android_deps.py
 
 # Build CMake for Android Studio
diff --git a/scripts/examples/gn_android_example.sh b/scripts/examples/gn_android_example.sh
index 5952eff0f0e8a8..8293329c6beac4 100755
--- a/scripts/examples/gn_android_example.sh
+++ b/scripts/examples/gn_android_example.sh
@@ -66,8 +66,6 @@ if [ -z "$TARGET_CPU" ]; then
     exit 1
 fi
 
-# Set up JARs
-python3 "$(dirname "$0")"/../../build/chip/java/tests/generate_jars_for_test.py
 python3 "$(dirname "$0")"/../../third_party/android_deps/set_up_android_deps.py
 
 gn gen --check --fail-on-unused-args --root="$EXAMPLE_DIR" "$OUTPUT_DIR" --args="target_os=\"android\" target_cpu=\"$TARGET_CPU\" android_ndk_root=\"$ANDROID_NDK_HOME\" android_sdk_root=\"$ANDROID_HOME\" ${GN_ARGS[*]}"