diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2014-08-27 16:25:03 +0200 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2014-08-27 16:25:03 +0200 |
| commit | 62da6247e26ae3726f119f0e5da5010ab3182844 (patch) | |
| tree | 4f9b04ff4b133e8ae7be915af6d5718197ca1b85 | |
| parent | 89fbe0ae6bf07e275707fa4bf6e53bfebbd4e89e (diff) | |
| download | toolchain_jack-62da6247e26ae3726f119f0e5da5010ab3182844.zip toolchain_jack-62da6247e26ae3726f119f0e5da5010ab3182844.tar.gz toolchain_jack-62da6247e26ae3726f119f0e5da5010ab3182844.tar.bz2 | |
Add build rules for PreProcessor grammar
Change-Id: I8bdcafc88635ca80a42a364518fe9ce9c3d2dfed
| -rw-r--r-- | build.xml | 8 | ||||
| -rw-r--r-- | jack/Android.mk | 32 |
2 files changed, 31 insertions, 9 deletions
@@ -140,12 +140,18 @@ <file name="${antlr.dist.dir}/${antlr.execname}" /> </filelist> </copy> - <!-- generate parser --> + <!-- generate ProGuard parser --> <java jar="${jack.tools.dir}/${antlr.execname}" fork="true" failonerror="true"> <arg line="-fo" /> <arg line="${jack.dir}/src/com/android/jack/shrob/proguard"/> <arg line="${jack.dir}/src/com/android/jack/shrob/proguard/Proguard.g"/> </java> + <!-- generate PreProcessor parser --> + <java jar="${jack.tools.dir}/${antlr.execname}" fork="true" failonerror="true"> + <arg line="-fo" /> + <arg line="${jack.dir}/src/com/android/jack/preprocessor"/> + <arg line="${jack.dir}/src/com/android/jack/preprocessor/PreProcessor.g"/> + </java> <!-- compile --> <javac srcdir="${jack.dir}/src" destdir="${jack.build.outdir}" diff --git a/jack/Android.mk b/jack/Android.mk index 174926a..b35a030 100644 --- a/jack/Android.mk +++ b/jack/Android.mk @@ -27,25 +27,41 @@ LOCAL_MODULE := jack LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := EXECUTABLES -antlr_intermediates := \ +proguard_intermediates := \ $(call local-intermediates-dir,COMMON)/grammar/com/android/jack/shrob/proguard -GEN := $(addprefix $(antlr_intermediates)/, \ +preprocessor_intermediates := \ + $(call local-intermediates-dir,COMMON)/grammar/com/android/jack/preprocessor + +GEN_PG := $(addprefix $(proguard_intermediates)/, \ ProguardLexer.java \ ProguardParser.java \ ) +GEN_PP := $(addprefix $(preprocessor_intermediates)/, \ + PreProcessorLexer.java \ + PreProcessorParser.java \ + PreProcessor_PreProcessorL.java \ + PreProcessor_PreProcessorL_Java.java \ +) + ANTLR_JACK_JAR = $(call java-lib-deps,antlr-jack,true) -$(GEN): $(ANTLR_JACK_JAR) -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = java -jar $(ANTLR_JACK_JAR) -fo $(dir $@) $< -$(GEN): $(LOCAL_PATH)/src/com/android/jack/shrob/proguard/Proguard.g +$(GEN_PG): $(ANTLR_JACK_JAR) +$(GEN_PG): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN_PG): PRIVATE_CUSTOM_TOOL = java -jar $(ANTLR_JACK_JAR) -fo $(dir $@) $< +$(GEN_PG): $(LOCAL_PATH)/src/com/android/jack/shrob/proguard/Proguard.g + $(transform-generated-source) + +$(GEN_PP): $(ANTLR_JACK_JAR) +$(GEN_PP): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN_PP): PRIVATE_CUSTOM_TOOL = java -jar $(ANTLR_JACK_JAR) -fo $(dir $@) $< +$(GEN_PP): $(LOCAL_PATH)/src/com/android/jack/preprocessor/PreProcessor.g $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN_PP) -LOCAL_SRC_FILES := $(filter-out %/ProguardLexer.java %/ProguardParser.java, \ +LOCAL_SRC_FILES := $(filter-out %/ProguardLexer.java %/ProguardParser.java %/PreProcessorLexer.java %/PreProcessorParser.java %/PreProcessor_PreProcessorL.java %/PreProcessor_PreProcessorL_Java.java, \ $(call all-java-files-under, src)) LOCAL_JAVA_RESOURCE_DIRS := rsc |