commit 5b2c6e26dbda66a2245f987db0428c2bf2eb7c95
author Yohann Roussel <yroussel@google.com> Wed May 20 17:52:15 2015 +0200
committer Yohann Roussel <yroussel@google.com> Thu May 28 18:10:03 2015 +0200
tree 2a1ba88379c1c9baae0a7f7a4d2ace176c9e0c8d
parent 09ee0a4252dbfd811f8345ab095c95ab78a1595f

Add support for RMTYPEDEF with Jack

Bug: 21099584
Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index bbc4b06..b8e2819 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1796,7 +1796,6 @@
 # - below we write the list of java files to java-source-list to avoid argument
 #   list length problems with Cygwin
 # - we filter out duplicate java file names because Jack doesn't like them.
-# TODO (yroussel) PRIVATE_RMTYPEDEFS
 define jack-java-to-dex
 $(hide) rm -f $@
 $(hide) rm -f $(PRIVATE_CLASSES_JACK)
@@ -1831,6 +1830,8 @@
     $(strip $(PRIVATE_JACK_DEBUG_FLAGS)) \
     $(if $(NO_OPTIMIZE_DX), \
         -D jack.dex.optimize="false") \
+    $(if $(PRIVATE_RMTYPEDEFS), \
+        -D jack.android.remove-typedef="true") \
     $(addprefix --classpath ,$(strip \
         $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_ALL_JACK_LIBRARIES)))) \
     $(addprefix --import ,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES))) \