Merge changes from topic "turbine"

am: 872246de0f Change-Id: I13cba047e145d0ab8c486a4ee60d53f2f5470737
2017-09-01 00:21:34 +00:00
parent 55b7eb41a8 872246de0f
commit fa8b66f5cc
9 changed files with 169 additions and 53 deletions
--- a/core/static_java_library.mk
+++ b/core/static_java_library.mk
@@ -184,6 +184,7 @@ $(full_classes_jack): $(R_file_stamp)
 $(jack_check_timestamp): $(R_file_stamp)
 endif # LOCAL_JACK_ENABLED
 $(full_classes_compiled_jar): $(R_file_stamp)
+$(full_classes_turbine_jar): $(R_file_stamp)


 # if we have custom proguarding done use the proguarded classes jar instead of the normal classes jar