diff options
| author | Jean-Philippe Lesot <jplesot@google.com> | 2015-01-21 13:52:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-21 13:52:52 +0000 |
| commit | edacaa3a260e60afa341e8d96724e857303f2de8 (patch) | |
| tree | a467692d5844fe754f7b4d9c5ada10b37feb94e3 /core/java.mk | |
| parent | c1ed9796bb14cb6257b3550caac107abc7b1aa79 (diff) | |
| parent | 0fbc9ff2a2eed243aabaa75e911e55c4cf4b8d4c (diff) | |
| download | build-edacaa3a260e60afa341e8d96724e857303f2de8.zip build-edacaa3a260e60afa341e8d96724e857303f2de8.tar.gz build-edacaa3a260e60afa341e8d96724e857303f2de8.tar.bz2 | |
Merge "Revert "Use Jack to check build""
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/java.mk b/core/java.mk index a2bd00b..5e9a285 100644 --- a/core/java.mk +++ b/core/java.mk @@ -262,17 +262,14 @@ 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 := $(full_classes_jack) -endif # !LOCAL_USE_JACK +java_alternative_checked_module := endif # TODO: It looks like the only thing we need from base_rules is |