release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release-4133428 snap-temp-L95800000077479875

Change-Id: Ibf6d29e8e4befc7567caf7ea2e1dd807b2dec829

9 files changed, 97 insertions, 43 deletions

diff --git a/tests/java_api/Android.mk b/tests/java_api/Android.mk
index dd928303..d070b876 100644
--- a/tests/java_api/Android.mk
+++ b/tests/java_api/Android.mk
@@ -1,5 +1,65 @@
-LOCAL_PATH:=$(call my-dir)
+LOCAL_PATH := $(call my-dir)
 
 ifneq (true,$(TARGET_BUILD_PDK))
+
+# Set RSTESTFORWARD_TARGETS
+include $(LOCAL_PATH)/RSTestForward/Targets.mk
+
 include $(call all-makefiles-under,$(LOCAL_PATH))
+
+
+# RSUnbundledTests
+# Tests that run on older devices
+
+my_modules := \
+    RSTestBackward \
+    RSTest_Compat \
+
+my_package_name := RSUnbundledTests
+
+include $(BUILD_SYSTEM)/tasks/tools/package-modules.mk
+
+.PHONY: RSUnbundledTests
+RSUnbundledTests: $(my_package_zip)
+
+$(call dist-for-goals,RSUnbundledTests,$(my_package_zip):$(my_package_name).zip)
+
+
+# RSUnbundledTests19
+# Tests that run on older devices (API 19 and below)
+
+my_modules := \
+    RSTestBackward19 \
+    RSTest_Compat19 \
+
+my_package_name := RSUnbundledTests19
+
+include $(BUILD_SYSTEM)/tasks/tools/package-modules.mk
+
+$(call dist-for-goals,RSUnbundledTests,$(my_package_zip):$(my_package_name).zip)
+
+
+# RSTests
+# Tests that run on latest platform build
+
+ifneq ($(ENABLE_RSTESTS),)
+
+my_modules := \
+    RSTest \
+    RSTest_Compat \
+    $(RSTESTFORWARD_TARGETS) \
+
+my_package_name := RSTests
+
+include $(BUILD_SYSTEM)/tasks/tools/package-modules.mk
+
+.PHONY: RSTests
+RSTests: $(my_package_zip)
+
+$(call dist-for-goals,RSTests,$(my_package_zip):$(my_package_name).zip)
+
+endif
+
+RSTESTFORWARD_TARGETS :=
+
 endif
diff --git a/tests/java_api/RSTestBackward/Android.mk b/tests/java_api/RSTestBackward/Android.mk
index 87a1b44f..5067f3f2 100644
--- a/tests/java_api/RSTestBackward/Android.mk
+++ b/tests/java_api/RSTestBackward/Android.mk
@@ -17,8 +17,8 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := tests
 LOCAL_PACKAGE_NAME := RSTestBackward
+LOCAL_MODULE_TAGS := tests
 
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src)\
@@ -33,6 +33,3 @@ LOCAL_MIN_SDK_VERSION := 21
 
 include $(BUILD_PACKAGE)
 
-# Allows RSTestBackward.apk to be added to DIST_DIR when "m dist RSTestBackward"
-$(call dist-for-goals,$(LOCAL_PACKAGE_NAME),\
-    $(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)
diff --git a/tests/java_api/RSTestBackward19/Android.mk b/tests/java_api/RSTestBackward19/Android.mk
index 1ba43133..5bb32dd4 100644
--- a/tests/java_api/RSTestBackward19/Android.mk
+++ b/tests/java_api/RSTestBackward19/Android.mk
@@ -104,4 +104,3 @@ include $(BUILD_PACKAGE)
 
 my_rs_unit_tests_path :=
 
-$(call dist-for-goals,$(LOCAL_PACKAGE_NAME),$(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)
diff --git a/tests/java_api/RSTestForward/Android.mk b/tests/java_api/RSTestForward/Android.mk
index d0c9cc10..40b4bc44 100644
--- a/tests/java_api/RSTestForward/Android.mk
+++ b/tests/java_api/RSTestForward/Android.mk
@@ -17,10 +17,9 @@
 # This file is auto-generated by frameworks/rs/tests/java_api/RSUnitTests/RSUnitTests.py.
 # To change unit tests version, please run the Python script above.
 
-ifneq ($(ENABLE_RSTESTFORWARD),)
+ifneq ($(ENABLE_RSTESTS),)
 
 LOCAL_PATH := $(call my-dir)
-my_rs_test_forward_targets :=
 my_rs_unit_tests_path := ../RSUnitTests/src/com/android/rs/unittest
 
 # RSTestForward for build tool version 21.1.2
@@ -116,8 +115,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/vector.rs\
 
 include $(BUILD_PACKAGE)
-$(call dist-for-goals,RSTestForward,$(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)
-my_rs_test_forward_targets += $(LOCAL_BUILT_MODULE)
 
 # RSTestForward for build tool version 22.0.1
 
@@ -212,8 +209,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/vector.rs\
 
 include $(BUILD_PACKAGE)
-$(call dist-for-goals,RSTestForward,$(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)
-my_rs_test_forward_targets += $(LOCAL_BUILT_MODULE)
 
 # RSTestForward for build tool version 23.0.3
 
@@ -329,8 +324,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/vector.rs\
 
 include $(BUILD_PACKAGE)
-$(call dist-for-goals,RSTestForward,$(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)
-my_rs_test_forward_targets += $(LOCAL_BUILT_MODULE)
 
 # RSTestForward for build tool version 24.0.3
 
@@ -472,8 +465,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/vector.rs\
 
 include $(BUILD_PACKAGE)
-$(call dist-for-goals,RSTestForward,$(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)
-my_rs_test_forward_targets += $(LOCAL_BUILT_MODULE)
 
 # RSTestForward for build tool version 25.0.2
 
@@ -615,12 +606,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)\
     $(my_rs_unit_tests_path)/vector.rs\
 
 include $(BUILD_PACKAGE)
-$(call dist-for-goals,RSTestForward,$(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)
-my_rs_test_forward_targets += $(LOCAL_BUILT_MODULE)
 
-.PHONY: RSTestForward
-RSTestForward: $(my_rs_test_forward_targets)
 my_rs_unit_tests_path :=
-my_rs_test_forward_targets :=
 
 endif
diff --git a/tests/java_api/RSTestForward/Targets.mk b/tests/java_api/RSTestForward/Targets.mk
new file mode 100644
index 00000000..52629a43
--- /dev/null
+++ b/tests/java_api/RSTestForward/Targets.mk
@@ -0,0 +1,6 @@
+RSTESTFORWARD_TARGETS := \
+    RSTestForward_21_1_2 \
+    RSTestForward_22_0_1 \
+    RSTestForward_23_0_3 \
+    RSTestForward_24_0_3 \
+    RSTestForward_25_0_2 \
diff --git a/tests/java_api/RSTest_CompatLib/Android.mk b/tests/java_api/RSTest_CompatLib/Android.mk
index e3f98f18..f21ddf7c 100644
--- a/tests/java_api/RSTest_CompatLib/Android.mk
+++ b/tests/java_api/RSTest_CompatLib/Android.mk
@@ -38,6 +38,3 @@ LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 
 include $(BUILD_PACKAGE)
 
-# Allows RSTest_Compat.apk to be added to DIST_DIR when "m dist RSTest_Compat"
-$(call dist-for-goals,$(LOCAL_PACKAGE_NAME),\
-    $(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)
diff --git a/tests/java_api/RSTest_CompatLib19/Android.mk b/tests/java_api/RSTest_CompatLib19/Android.mk
index 96a558b9..5e83e657 100644
--- a/tests/java_api/RSTest_CompatLib19/Android.mk
+++ b/tests/java_api/RSTest_CompatLib19/Android.mk
@@ -110,4 +110,3 @@ include $(BUILD_PACKAGE)
 
 my_rs_unit_tests_path :=
 
-$(call dist-for-goals,$(LOCAL_PACKAGE_NAME),$(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)
diff --git a/tests/java_api/RSUnitTests/RSUnitTests.py b/tests/java_api/RSUnitTests/RSUnitTests.py
index 9a974c2a..e47a60f8 100644
--- a/tests/java_api/RSUnitTests/RSUnitTests.py
+++ b/tests/java_api/RSUnitTests/RSUnitTests.py
@@ -380,12 +380,10 @@ def WriteSupportLib19Makefile(gen_file):
       'my_rs_unit_tests_path := ../RSUnitTests/supportlibsrc_gen/com/android/rs/unittest\n'
   )
   WriteMakeSrcFiles(gen_file, 19)
-  # With dist-for-goals, copy the target to DIST_DIR with 'make dist'
   gen_file.write(
       '\n'
       'include $(BUILD_PACKAGE)\n\n'
       'my_rs_unit_tests_path :=\n\n'
-      '$(call dist-for-goals,$(LOCAL_PACKAGE_NAME),$(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)\n'
   )
 
 
@@ -395,6 +393,7 @@ def SupportLib19MakefileLocation():
 
 
 def GenerateSupportLib19():
+  """Generates the necessary file for Support Library tests (19)."""
   with open(SupportLib19MakefileLocation(), 'w') as gen_file:
     WriteSupportLib19Makefile(gen_file)
   print ('Generated support lib (19) Makefile at {}'
@@ -404,6 +403,13 @@ def GenerateSupportLib19():
 # ---------- RSTestForward ----------
 
 
+def ForwardTargetName(build_tool_version_name):
+  """Returns the target name for a forward compatibility build tool name."""
+  make_target_name = 'RSTestForward_{}'.format(build_tool_version_name)
+  make_target_name = make_target_name.replace('.', '_')
+  return make_target_name
+
+
 def ForwardMakefileLocation():
   """Returns the location of the Makefile for forward compatibility testing."""
   return os.path.join(ThisScriptDir(), '..', 'RSTestForward', 'Android.mk')
@@ -419,16 +425,14 @@ def WriteForwardMakefile(gen_file):
   gen_file.write(
       '# This file is auto-generated by frameworks/rs/tests/java_api/RSUnitTests/RSUnitTests.py.\n'
       '# To change unit tests version, please run the Python script above.\n\n'
-      'ifneq ($(ENABLE_RSTESTFORWARD),)\n\n'
+      'ifneq ($(ENABLE_RSTESTS),)\n\n'
       'LOCAL_PATH := $(call my-dir)\n'
-      'my_rs_test_forward_targets :=\n'
       'my_rs_unit_tests_path := ../RSUnitTests/src/com/android/rs/unittest\n'
   )
   all_make_target_names = []
   for build_tool_version in sorted(BUILD_TOOL_VERSIONS.keys()):
     build_tool_version_name = BUILD_TOOL_VERSIONS[build_tool_version]
-    make_target_name = 'RSTestForward_{}'.format(build_tool_version_name)
-    make_target_name = make_target_name.replace('.', '_')
+    make_target_name = ForwardTargetName(build_tool_version_name)
     all_make_target_names.append(make_target_name)
     gen_file.write(
         '\n'
@@ -447,30 +451,41 @@ def WriteForwardMakefile(gen_file):
         )
     )
     WriteMakeSrcFiles(gen_file, build_tool_version)
-    # With dist-for-goals, copy the target to DIST_DIR with 'make dist'
     gen_file.write(
         '\n'
         'include $(BUILD_PACKAGE)\n'
-        '$(call dist-for-goals,RSTestForward,$(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)\n'
-        'my_rs_test_forward_targets += $(LOCAL_BUILT_MODULE)\n'
     )
   # Create RSTestForward phony target which builds all above targets
   gen_file.write(
       '\n'
-      '.PHONY: RSTestForward\n'
-      'RSTestForward: $(my_rs_test_forward_targets)\n'
-      'my_rs_unit_tests_path :=\n'
-      'my_rs_test_forward_targets :=\n\n'
+      'my_rs_unit_tests_path :=\n\n'
       'endif\n'.format(' '.join(all_make_target_names))
   )
 
 
+def ForwardMakeTargetsLocation():
+  """Returns the location of the file with all forward compatibility targets."""
+  return os.path.join(ThisScriptDir(), '..', 'RSTestForward', 'Targets.mk')
+
+
+def WriteForwardMakeTargets(gen_file):
+  """Writes forward compatibility make target names to gen_file."""
+  gen_file.write('RSTESTFORWARD_TARGETS := \\\n')
+  for build_tool_version_name in sorted(BUILD_TOOL_VERSIONS.values()):
+    make_target_name = ForwardTargetName(build_tool_version_name)
+    gen_file.write('    {} \\\n'.format(make_target_name))
+
+
 def GenerateForward():
   """Generates the necessary file for forward compatibility testing."""
   with open(ForwardMakefileLocation(), 'w') as gen_file:
     WriteForwardMakefile(gen_file)
   print ('Generated forward compatibility Makefile at {}'
          .format(ForwardMakefileLocation()))
+  with open(ForwardMakeTargetsLocation(), 'w') as gen_file:
+    WriteForwardMakeTargets(gen_file)
+  print ('Generated forward compatibility targets at {}'
+         .format(ForwardMakeTargetsLocation()))
 
 
 # ---------- RSTestBackward ----------
@@ -549,12 +564,10 @@ def WriteBackward19Makefile(gen_file):
       'my_rs_unit_tests_path := ../RSUnitTests/src/com/android/rs/unittest\n'
   )
   WriteMakeSrcFiles(gen_file, 19)
-  # With dist-for-goals, copy the target to DIST_DIR with 'make dist'
   gen_file.write(
       '\n'
       'include $(BUILD_PACKAGE)\n\n'
       'my_rs_unit_tests_path :=\n\n'
-      '$(call dist-for-goals,$(LOCAL_PACKAGE_NAME),$(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)\n'
   )
 
 
diff --git a/tests/java_api/RsTest/Android.mk b/tests/java_api/RsTest/Android.mk
index 23aaef8d..735b5bbf 100644
--- a/tests/java_api/RsTest/Android.mk
+++ b/tests/java_api/RsTest/Android.mk
@@ -33,6 +33,3 @@ LOCAL_COMPATIBILITY_SUITE := device-tests
 
 include $(BUILD_PACKAGE)
 
-# Allows RSTest.apk to be added to DIST_DIR when "m dist RSTest"
-$(call dist-for-goals,$(LOCAL_PACKAGE_NAME),\
-    $(LOCAL_BUILT_MODULE):$(LOCAL_PACKAGE_NAME).apk)