diff options
author | Cole Faust <colefaust@google.com> | 2023-11-17 19:50:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-17 19:50:21 +0000 |
commit | 7d244e388990e0be3d4ed097bf93bc85a9c67a28 (patch) | |
tree | ad5dc6f4fb6d332defba3bd868d60d8e2a6012c1 | |
parent | d82ffd57d46c8efb6e0f17b95995c5d20cc438e2 (diff) | |
parent | 9c8c391d6490d198923b793bf1615475235b1fc2 (diff) | |
download | rs-7d244e388990e0be3d4ed097bf93bc85a9c67a28.tar.gz |
Merge "Sandbox renderscript genrules" into main am: 9c8c391d64
Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/2834797
Change-Id: Ife4f4f3b4ac3121ac3ab9cb928198ea2acf9f6ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | tests/java_api/Balls/Android.bp | 1 | ||||
-rw-r--r-- | tests/java_api/ImageProcessing/Android.bp | 1 | ||||
-rw-r--r-- | tests/java_api/ImageProcessing2/Android.bp | 1 | ||||
-rw-r--r-- | tests/java_api/ImageProcessing_jb/Android.bp | 1 | ||||
-rw-r--r-- | tests/java_api/RSUnitTests/Android.bp | 7 | ||||
-rw-r--r-- | tests/java_api/Refocus/Android.bp | 1 | ||||
-rw-r--r-- | tests/java_api/RsTest/Android.bp | 1 | ||||
-rw-r--r-- | tests/java_api/RsTest_11/Android.bp | 1 | ||||
-rw-r--r-- | tests/java_api/RsTest_14/Android.bp | 1 | ||||
-rw-r--r-- | tests/java_api/RsTest_16/Android.bp | 1 |
10 files changed, 16 insertions, 0 deletions
diff --git a/tests/java_api/Balls/Android.bp b/tests/java_api/Balls/Android.bp index e931d3e9..50726fa5 100644 --- a/tests/java_api/Balls/Android.bp +++ b/tests/java_api/Balls/Android.bp @@ -43,6 +43,7 @@ genrule { name: "RsBalls-rscript", srcs: [ "src/**/*.rscript", + "src/**/*.rsh", ":rs_script_api", ":rs_clang_headers", ], diff --git a/tests/java_api/ImageProcessing/Android.bp b/tests/java_api/ImageProcessing/Android.bp index 6ac21676..109917ac 100644 --- a/tests/java_api/ImageProcessing/Android.bp +++ b/tests/java_api/ImageProcessing/Android.bp @@ -41,6 +41,7 @@ genrule { name: "ImageProcessing-rscript", srcs: [ "src/**/*.rscript", + "src/**/*.rsh", ":rs_script_api", ":rs_clang_headers", ], diff --git a/tests/java_api/ImageProcessing2/Android.bp b/tests/java_api/ImageProcessing2/Android.bp index 85c3a14c..80aee1bf 100644 --- a/tests/java_api/ImageProcessing2/Android.bp +++ b/tests/java_api/ImageProcessing2/Android.bp @@ -39,6 +39,7 @@ genrule { name: "ImageProcessing2-rscript", srcs: [ "src/**/*.rscript", + "src/**/*.rsh", ":rs_script_api", ":rs_clang_headers", ], diff --git a/tests/java_api/ImageProcessing_jb/Android.bp b/tests/java_api/ImageProcessing_jb/Android.bp index 9ffa7edc..8ca36e2e 100644 --- a/tests/java_api/ImageProcessing_jb/Android.bp +++ b/tests/java_api/ImageProcessing_jb/Android.bp @@ -41,6 +41,7 @@ genrule { name: "ImageProcessingJB-rscript", srcs: [ "src/**/*.rscript", + "src/**/*.rsh", ":rs_script_api", ":rs_clang_headers", ], diff --git a/tests/java_api/RSUnitTests/Android.bp b/tests/java_api/RSUnitTests/Android.bp index 7d35d9fa..04b4d6f8 100644 --- a/tests/java_api/RSUnitTests/Android.bp +++ b/tests/java_api/RSUnitTests/Android.bp @@ -34,6 +34,13 @@ filegroup { } filegroup { + name: "RSUnitTests_rscript_hdrs", + srcs: [ + "src/**/*.rsh", + ], +} + +filegroup { name: "RSUnitTests_java_gui", srcs: [ "gui/**/*.java", diff --git a/tests/java_api/Refocus/Android.bp b/tests/java_api/Refocus/Android.bp index 26af7aa1..aff5b3ae 100644 --- a/tests/java_api/Refocus/Android.bp +++ b/tests/java_api/Refocus/Android.bp @@ -42,6 +42,7 @@ genrule { name: "Refocus-rscript", srcs: [ "src/**/*.rscript", + "src/**/*.rsh", ":rs_script_api", ":rs_clang_headers", ], diff --git a/tests/java_api/RsTest/Android.bp b/tests/java_api/RsTest/Android.bp index 36952348..7b050d59 100644 --- a/tests/java_api/RsTest/Android.bp +++ b/tests/java_api/RsTest/Android.bp @@ -41,6 +41,7 @@ genrule { name: "RSTest-rscript", srcs: [ ":RSUnitTests_rscript_srcs", + ":RSUnitTests_rscript_hdrs", ":rs_script_api", ":rs_clang_headers", ], diff --git a/tests/java_api/RsTest_11/Android.bp b/tests/java_api/RsTest_11/Android.bp index 1e176d27..31335934 100644 --- a/tests/java_api/RsTest_11/Android.bp +++ b/tests/java_api/RsTest_11/Android.bp @@ -43,6 +43,7 @@ genrule { name: "RSTest_v11-rscript", srcs: [ "src/**/*.rscript", + "src/**/*.rsh", ":rs_script_api", ":rs_clang_headers", ], diff --git a/tests/java_api/RsTest_14/Android.bp b/tests/java_api/RsTest_14/Android.bp index 0f526497..9f6f4e43 100644 --- a/tests/java_api/RsTest_14/Android.bp +++ b/tests/java_api/RsTest_14/Android.bp @@ -43,6 +43,7 @@ genrule { name: "RSTest_v14-rscript", srcs: [ "src/**/*.rscript", + "src/**/*.rsh", ":rs_script_api", ":rs_clang_headers", ], diff --git a/tests/java_api/RsTest_16/Android.bp b/tests/java_api/RsTest_16/Android.bp index 50fce593..7204c932 100644 --- a/tests/java_api/RsTest_16/Android.bp +++ b/tests/java_api/RsTest_16/Android.bp @@ -43,6 +43,7 @@ genrule { name: "RSTest_v16-rscript", srcs: [ "src/**/*.rscript", + "src/**/*.rsh", ":rs_script_api", ":rs_clang_headers", ], |