diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2014-08-28 12:00:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-28 12:00:38 +0000 |
| commit | 10ed6e73f43fee4ba894fddfb15734d2401128c4 (patch) | |
| tree | a30215c464e5a4984795158fc5cfcc5f38e054ff /jack-tests | |
| parent | b4940710276d1653935ad76aa3ba6b29649284ad (diff) | |
| parent | e29c8bbd16880c21c15e798ef92c00dd66e9d688 (diff) | |
| download | toolchain_jack-10ed6e73f43fee4ba894fddfb15734d2401128c4.zip toolchain_jack-10ed6e73f43fee4ba894fddfb15734d2401128c4.tar.gz toolchain_jack-10ed6e73f43fee4ba894fddfb15734d2401128c4.tar.bz2 | |
Merge "Address comments in PreProcessor grammar" into ub-jack
Diffstat (limited to 'jack-tests')
| -rw-r--r-- | jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1.java (renamed from jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java) | 2 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotation.java (renamed from jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java) | 2 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotationInterface.java (renamed from jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java) | 2 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1.java index 877943d..cb66562 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/ApplicationActivity1.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack.app1; +package com.android.jack.preprocessor.test001.jack.app1; import com.android.jack.preprocessor.test001.jack.Activity; import com.android.jack.preprocessor.test001.jack.Application; diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotation.java index 2d4479d..8e4ccf2 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack.app1; +package com.android.jack.preprocessor.test001.jack.app1; import com.android.jack.preprocessor.test001.jack.Context; diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotationInterface.java index 305abf3..01feaa9 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/app1/NoAnnotationInterface.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack.app1; +package com.android.jack.preprocessor.test001.jack.app1; import com.android.jack.preprocessor.test001.jack.Context; diff --git a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp index 1f4f13b..f30d1d2 100644 --- a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp @@ -1,7 +1,7 @@ test001: @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller class * - modifiers { + is { public | private } extends { @@ -13,20 +13,20 @@ test001: | class com.android.jack.preprocessor.test001.jack.BackupAgent | class com.android.jack.preprocessor.test001.jack.Application } - annotate { + do { @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller method * <init>(); } test002: class * - modifiers { + is { public } extends { class com.android.jack.preprocessor.test001.jack.Application } - annotate { + do { @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller method void attachBaseContext(class com.android.jack.preprocessor.test001.jack.Context) modifiers { |