commit c5958ce8cc4f61b4602d5318dd6ad985c3a4d2ae
author Eric Arseneau <earseneau@google.com> Thu Dec 10 15:41:39 2020 -0800
committer Eric Arseneau <earseneau@google.com> Thu Dec 10 15:41:39 2020 -0800
tree 90e27498547a272036fedafed08c9351140b0078
parent 892ee7f7dbc0699723aa6fc85710db6317eba89c
parent 05b41b1268f1c1b511a00bda240f9b328bef03d8

Merge spl-2020-12-05

Change-Id: I0f7c26a4e2586ae013870a70b177f441204501fe

cpu_ref/Android.bp

diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp
index 84b90af..d5b522b 100644
--- a/cpu_ref/Android.bp
+++ b/cpu_ref/Android.bp
@@ -7,7 +7,6 @@
         enabled: true,
         support_system_process: true,
     },
-
     srcs: [
         "rsCpuCore.cpp",
         "rsCpuExecutable.cpp",

tests/java_api/Android.mk

diff --git a/tests/java_api/Android.mk b/tests/java_api/Android.mk
index d070b87..54845a1 100644
--- a/tests/java_api/Android.mk
+++ b/tests/java_api/Android.mk
@@ -36,7 +36,11 @@
 
 include $(BUILD_SYSTEM)/tasks/tools/package-modules.mk
 
+.PHONY: RSUnbundledTests19
+RSUnbundledTests19: $(my_package_zip)
+
 $(call dist-for-goals,RSUnbundledTests,$(my_package_zip):$(my_package_name).zip)
+$(call dist-for-goals,RSUnbundledTests19,$(my_package_zip):$(my_package_name).zip)
 
 
 # RSTests