diff options
author | Benoit Lamarche <benoitlamarche@google.com> | 2014-08-27 12:13:20 +0200 |
---|---|---|
committer | Benoit Lamarche <benoitlamarche@google.com> | 2014-08-27 15:28:54 +0200 |
commit | 89fbe0ae6bf07e275707fa4bf6e53bfebbd4e89e (patch) | |
tree | eb3d6832142ee3dda1285d4eb466c2267407069a /jack-tests/tests | |
parent | a152d5e98e4dab1b94b1a87d6d6625a2aa6f96de (diff) | |
download | toolchain_jack-89fbe0ae6bf07e275707fa4bf6e53bfebbd4e89e.zip toolchain_jack-89fbe0ae6bf07e275707fa4bf6e53bfebbd4e89e.tar.gz toolchain_jack-89fbe0ae6bf07e275707fa4bf6e53bfebbd4e89e.tar.bz2 |
Fix PreProcessor names and configuration
Change-Id: I4cd34c2b72a3accd41e01a4bd906004a44306f6f
Diffstat (limited to 'jack-tests/tests')
10 files changed, 46 insertions, 46 deletions
diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java index c306c28..877943d 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java +++ b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/ApplicationActivity1.java @@ -16,9 +16,9 @@ package com.android.jack.annotationadder.test001.jack.app1; -import com.android.jack.annotationadder.test001.jack.Activity; -import com.android.jack.annotationadder.test001.jack.Application; -import com.android.jack.annotationadder.test001.jack.Context; +import com.android.jack.preprocessor.test001.jack.Activity; +import com.android.jack.preprocessor.test001.jack.Application; +import com.android.jack.preprocessor.test001.jack.Context; public class ApplicationActivity1 extends Application implements Activity { diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java index bf65e0b..2d4479d 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java +++ b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotation.java @@ -16,7 +16,7 @@ package com.android.jack.annotationadder.test001.jack.app1; -import com.android.jack.annotationadder.test001.jack.Context; +import com.android.jack.preprocessor.test001.jack.Context; public class NoAnnotation { public NoAnnotation() { diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java index ea62d15..305abf3 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java +++ b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/app1/NoAnnotationInterface.java @@ -16,7 +16,7 @@ package com.android.jack.annotationadder.test001.jack.app1; -import com.android.jack.annotationadder.test001.jack.Context; +import com.android.jack.preprocessor.test001.jack.Context; public interface NoAnnotationInterface { diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/config.jpp b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/config.jpp deleted file mode 100644 index 249148e..0000000 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/config.jpp +++ /dev/null @@ -1,36 +0,0 @@ -test001: - @@com.android.jack.annotationadder.test001.jack.MultiDexInstaller - class * - modifiers { - public | private - } - extends { - class com.android.jack.annotationadder.test001.jack.Instrumentation - | class com.android.jack.annotationadder.test001.jack.Activity - | class com.android.jack.annotationadder.test001.jack.Service - | class com.android.jack.annotationadder.test001.jack.ContentProvider - | class com.android.jack.annotationadder.test001.jack.BroadcastReceiver - | class com.android.jack.annotationadder.test001.jack.BackupAgent - | class com.android.jack.annotationadder.test001.jack.Application - } - annotate { - @@com.android.jack.annotationadder.test001.jack.MultiDexInstaller - method * <init>(); - } - -test002: - class * - modifiers { - public - } - extends { - class com.android.jack.annotationadder.test001.jack.Application - } - annotate { - @@com.android.jack.annotationadder.test001.jack.MultiDexInstaller - method void attachBaseContext(class com.android.jack.annotationadder.test001.jack.Context) - modifiers { - public - } - ; - } diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Activity.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Activity.java index 9094de6..bc176ff 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Activity.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Activity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack; +package com.android.jack.preprocessor.test001.jack; public interface Activity { diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Application.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Application.java index 475d8db..de696f5 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Application.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Application.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack; +package com.android.jack.preprocessor.test001.jack; public class Application { diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Context.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Context.java index 2b930da..2a3ec17 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Context.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Context.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack; +package com.android.jack.preprocessor.test001.jack; public class Context { diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Instrumentation.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Instrumentation.java index edcf7cd..793e6fe 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Instrumentation.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Instrumentation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack; +package com.android.jack.preprocessor.test001.jack; public class Instrumentation { diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/MultiDexInstaller.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/MultiDexInstaller.java index 75f9c7e..eb06937 100644 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/MultiDexInstaller.java +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/MultiDexInstaller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.jack.annotationadder.test001.jack; +package com.android.jack.preprocessor.test001.jack; public @interface MultiDexInstaller { 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 new file mode 100644 index 0000000..1f4f13b --- /dev/null +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp @@ -0,0 +1,36 @@ +test001: + @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller + class * + modifiers { + public | private + } + extends { + class com.android.jack.preprocessor.test001.jack.Instrumentation + | class com.android.jack.preprocessor.test001.jack.Activity + | class com.android.jack.preprocessor.test001.jack.Service + | class com.android.jack.preprocessor.test001.jack.ContentProvider + | class com.android.jack.preprocessor.test001.jack.BroadcastReceiver + | class com.android.jack.preprocessor.test001.jack.BackupAgent + | class com.android.jack.preprocessor.test001.jack.Application + } + annotate { + @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller + method * <init>(); + } + +test002: + class * + modifiers { + public + } + extends { + class com.android.jack.preprocessor.test001.jack.Application + } + annotate { + @@com.android.jack.preprocessor.test001.jack.MultiDexInstaller + method void attachBaseContext(class com.android.jack.preprocessor.test001.jack.Context) + modifiers { + public + } + ; + } |