summaryrefslogtreecommitdiffstats
path: root/jack-tests/tests
diff options
context:
space:
mode:
authordelphinemartin <delphinemartin@google.com>2014-04-14 16:00:20 +0200
committerdelphinemartin <delphinemartin@google.com>2014-04-14 16:37:07 +0200
commit686145a9e27d3305e6d683026dd0bc5751524efa (patch)
treea58f392cea9ea93dac828c42570a3b589905ebfd /jack-tests/tests
parent53496d198e515e416275850c505b60ccae42fe91 (diff)
downloadtoolchain_jack-686145a9e27d3305e6d683026dd0bc5751524efa.zip
toolchain_jack-686145a9e27d3305e6d683026dd0bc5751524efa.tar.gz
toolchain_jack-686145a9e27d3305e6d683026dd0bc5751524efa.tar.bz2
Modify FileConflict.test004 to use the Rot13NameProvider
- -flattenpackage was removed since it was not necessary and not working well with the Rot13NameProvider + added default bootclasspath when shrobbing Change-Id: Id74366d06e29256fd87a6f8d9bfdc5902bc6bebd
Diffstat (limited to 'jack-tests/tests')
-rw-r--r--jack-tests/tests/com/android/jack/fileconflict/test004/jack/proguard.flags1
1 files changed, 0 insertions, 1 deletions
diff --git a/jack-tests/tests/com/android/jack/fileconflict/test004/jack/proguard.flags b/jack-tests/tests/com/android/jack/fileconflict/test004/jack/proguard.flags
index 4cfc4ab..ddaf54b 100644
--- a/jack-tests/tests/com/android/jack/fileconflict/test004/jack/proguard.flags
+++ b/jack-tests/tests/com/android/jack/fileconflict/test004/jack/proguard.flags
@@ -1,4 +1,3 @@
-dontshrink
-adaptresourcefilenames
-keep,allowobfuscation class com.android.jack.fileconflict.test004.jack.MyClass
--flattenpackagehierarchy