diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-01-15 17:58:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-15 17:58:36 +0000 |
| commit | 8b5ff260d9cd41f1ffba56ca37422d809145fdf0 (patch) | |
| tree | 547f70d79502b71619cb9339ace18857ed92f3a0 /core/java.mk | |
| parent | b515f27d6bbe7a976bd0920f031812f62bb135f7 (diff) | |
| parent | 8bc90fd2d6ccf70b65d2d3aad22b0453b86a262d (diff) | |
| download | build-8b5ff260d9cd41f1ffba56ca37422d809145fdf0.zip build-8b5ff260d9cd41f1ffba56ca37422d809145fdf0.tar.gz build-8b5ff260d9cd41f1ffba56ca37422d809145fdf0.tar.bz2 | |
Merge "Use Jack to check build"
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java.mk b/core/java.mk index c29d587..31f32dd 100644 --- a/core/java.mk +++ b/core/java.mk @@ -268,14 +268,17 @@ LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp) LOCAL_RESOURCE_DIR := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript/res $(LOCAL_RESOURCE_DIR) endif +java_alternative_checked_module := +ifdef full_classes_jar +ifneq ($(strip $(LOCAL_USE_JACK)),true) # All of the rules after full_classes_compiled_jar are very unlikely # to fail except for bugs in their respective tools. If you would # like to run these rules, add the "all" modifier goal to the make # command line. -ifdef full_classes_jar java_alternative_checked_module := $(full_classes_compiled_jar) else -java_alternative_checked_module := +java_alternative_checked_module := $(full_classes_jack) +endif # !LOCAL_USE_JACK endif # TODO: It looks like the only thing we need from base_rules is |