diff options
author | mikaelpeltier <mikaelpeltier@google.com> | 2014-11-14 09:38:56 +0100 |
---|---|---|
committer | mikaelpeltier <mikaelpeltier@google.com> | 2014-11-17 17:27:54 +0100 |
commit | 2f5cdf7f3f2fcf407c6c46c2d55498728da0453b (patch) | |
tree | b1af6d4cfc2d37b3e073abcce0af44dfc26e12c8 /jack-tests/tests | |
parent | 1cf6a3899617f508ed1b476d2eeb8464fa86e158 (diff) | |
download | toolchain_jack-2f5cdf7f3f2fcf407c6c46c2d55498728da0453b.zip toolchain_jack-2f5cdf7f3f2fcf407c6c46c2d55498728da0453b.tar.gz toolchain_jack-2f5cdf7f3f2fcf407c6c46c2d55498728da0453b.tar.bz2 |
Jack generates lib version 1.1
- All jayce files are into a folder jayce
- All intermediates dex files are into a folder dex
- All .jpp files are into a folder jpp
- All resource files are into a folder rsc
- Disable usage of dex from library when jarjar and obfuscation is enabled
Change-Id: Id0f92b4519953a0bc41c76a55700a2c6f6ce5ec3
Diffstat (limited to 'jack-tests/tests')
-rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib1/IrrelevantForTest.java (renamed from jack-tests/tests/com/android/jack/fileconflict/test002/jack/IrrelevantForTest.java) | 2 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib1/rsc/Resource1 (renamed from jack-tests/tests/com/android/jack/fileconflict/test002/jack/Resource1) | 0 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib1/rsc/Resource2 (renamed from jack-tests/tests/com/android/jack/fileconflict/test002/jack/Resource2) | 0 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib2/IrrelevantForTest2.java (renamed from jack-tests/tests/com/android/jack/fileconflict/test002/jack/IrrelevantForTest2.java) | 2 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib2/rsc/Resource1 (renamed from jack-tests/tests/com/android/jack/resource/test001/jack/Resource1) | 0 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib2/rsc/Resource3 (renamed from jack-tests/tests/com/android/jack/fileconflict/test002/jack/Resource3) | 0 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/resource/test001/jack/rsc/Resource1 | 1 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/resource/test001/jack/rsc/Resource2 (renamed from jack-tests/tests/com/android/jack/resource/test001/jack/Resource2) | 0 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/resource/test001/jack/rsc/pack/Resource3 (renamed from jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource3) | 0 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/resource/test001/jack/rsc/pack/Resource4 (renamed from jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource4) | 0 |
10 files changed, 3 insertions, 2 deletions
diff --git a/jack-tests/tests/com/android/jack/fileconflict/test002/jack/IrrelevantForTest.java b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib1/IrrelevantForTest.java index 509cb43..a25e9e8 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/test002/jack/IrrelevantForTest.java +++ b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib1/IrrelevantForTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.fileconflict.test002.jack; +package com.android.jack.fileconflict.test002.jack.lib1; /** * This class is irrelevant for the test, since what we test here is the handling of resources. diff --git a/jack-tests/tests/com/android/jack/fileconflict/test002/jack/Resource1 b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib1/rsc/Resource1 index b98ccd9..b98ccd9 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/test002/jack/Resource1 +++ b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib1/rsc/Resource1 diff --git a/jack-tests/tests/com/android/jack/fileconflict/test002/jack/Resource2 b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib1/rsc/Resource2 index 1bcdbc0..1bcdbc0 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/test002/jack/Resource2 +++ b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib1/rsc/Resource2 diff --git a/jack-tests/tests/com/android/jack/fileconflict/test002/jack/IrrelevantForTest2.java b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib2/IrrelevantForTest2.java index abfbf29..b44d31a 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/test002/jack/IrrelevantForTest2.java +++ b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib2/IrrelevantForTest2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.fileconflict.test002.jack; +package com.android.jack.fileconflict.test002.jack.lib2; /** * This class is irrelevant for the test, since what we test here is the handling of resources. diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/Resource1 b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib2/rsc/Resource1 index b98ccd9..b98ccd9 100644 --- a/jack-tests/tests/com/android/jack/resource/test001/jack/Resource1 +++ b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib2/rsc/Resource1 diff --git a/jack-tests/tests/com/android/jack/fileconflict/test002/jack/Resource3 b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib2/rsc/Resource3 index d0da24e..d0da24e 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/test002/jack/Resource3 +++ b/jack-tests/tests/com/android/jack/fileconflict/test002/jack/lib2/rsc/Resource3 diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/rsc/Resource1 b/jack-tests/tests/com/android/jack/resource/test001/jack/rsc/Resource1 new file mode 100644 index 0000000..b98ccd9 --- /dev/null +++ b/jack-tests/tests/com/android/jack/resource/test001/jack/rsc/Resource1 @@ -0,0 +1 @@ +Res1 diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/Resource2 b/jack-tests/tests/com/android/jack/resource/test001/jack/rsc/Resource2 index 1bcdbc0..1bcdbc0 100644 --- a/jack-tests/tests/com/android/jack/resource/test001/jack/Resource2 +++ b/jack-tests/tests/com/android/jack/resource/test001/jack/rsc/Resource2 diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource3 b/jack-tests/tests/com/android/jack/resource/test001/jack/rsc/pack/Resource3 index d0da24e..d0da24e 100644 --- a/jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource3 +++ b/jack-tests/tests/com/android/jack/resource/test001/jack/rsc/pack/Resource3 diff --git a/jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource4 b/jack-tests/tests/com/android/jack/resource/test001/jack/rsc/pack/Resource4 index cf38257..cf38257 100644 --- a/jack-tests/tests/com/android/jack/resource/test001/jack/pack/Resource4 +++ b/jack-tests/tests/com/android/jack/resource/test001/jack/rsc/pack/Resource4 |