commit b4ee77aefb70a2921b370edd0f30cbd9fec802a4
author Colin Cross <ccross@android.com> Mon Mar 12 18:23:15 2018 -0700
committer Colin Cross <ccross@android.com> Tue Mar 20 15:47:45 2018 -0700
tree 42280fb11ce99eb90a8d19781225ce2786902463
parent ec7be103d0068995d85fcd03fa6edec9d1b1ec97

Move java renderscript support to java_renderscript.mk

Move java renderscript support to java_renderscript.mk in
preparation to moving it before aapt.  Filter *.rs files
out of LOCAL_SRC_FILES and forbid them in java_common.mk
so that using *.rs files is an error if java_renderscript.mk
was not included.

Bug: 73885582
Test: m checkbuild
Change-Id: Ib37ce89daee58b025dec98f733c5a08149641afd
Merged-In: Ib37ce89daee58b025dec98f733c5a08149641afd
(cherry picked from commit 71822d6fb96facf4907a68d5401d7df22f3dc144)

core/java_common.mk

diff --git a/core/java_common.mk b/core/java_common.mk
index 4b10d2d..2b85dc1 100644
--- a/core/java_common.mk
+++ b/core/java_common.mk
@@ -177,7 +177,7 @@
 #####################################
 ## Warn if there is unrecognized file in LOCAL_SRC_FILES.
 my_unknown_src_files := $(filter-out \
-  %.java %.aidl %.proto %.logtags %.rs, \
+  %.java %.aidl %.proto %.logtags, \
   $(LOCAL_SRC_FILES) $(LOCAL_INTERMEDIATE_SOURCES) $(LOCAL_GENERATED_SOURCES))
 ifneq ($(my_unknown_src_files),)
 $(warning $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): Unused source files: $(my_unknown_src_files))