commit b518c3ec0bcd2d874be19fa4717262ad771fcc9c
author Yohann Roussel <yroussel@google.com> Wed May 20 17:52:15 2015 +0200
committer Yohann Roussel <yroussel@google.com> Tue Jun 02 12:25:51 2015 +0200
tree 28db119de11d2c43261d6d2c7ef0bcf06c488379
parent b7bb040c75922795b47434e09cd09842ad11fd46

[DO NOT MERGE] Add support for RMTYPEDEF with Jack

Bug: 21099584

(cherry-picked from commit 5b2c6e26dbda66a2245f987db0428c2bf2eb7c95)

Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 87c94c0..db51f94 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1805,7 +1805,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)
@@ -1840,6 +1839,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))) \