From 89fbe0ae6bf07e275707fa4bf6e53bfebbd4e89e Mon Sep 17 00:00:00 2001 From: Benoit Lamarche Date: Wed, 27 Aug 2014 12:13:20 +0200 Subject: Fix PreProcessor names and configuration Change-Id: I4cd34c2b72a3accd41e01a4bd906004a44306f6f --- .../annotationadder/test001/jack/Activity.java | 21 ------------- .../annotationadder/test001/jack/Application.java | 21 ------------- .../jack/annotationadder/test001/jack/Context.java | 21 ------------- .../test001/jack/Instrumentation.java | 21 ------------- .../test001/jack/MultiDexInstaller.java | 21 ------------- .../test001/jack/app1/ApplicationActivity1.java | 6 ++-- .../test001/jack/app1/NoAnnotation.java | 2 +- .../test001/jack/app1/NoAnnotationInterface.java | 2 +- .../jack/annotationadder/test001/jack/config.jpp | 36 ---------------------- .../jack/preprocessor/test001/jack/Activity.java | 21 +++++++++++++ .../preprocessor/test001/jack/Application.java | 21 +++++++++++++ .../jack/preprocessor/test001/jack/Context.java | 21 +++++++++++++ .../preprocessor/test001/jack/Instrumentation.java | 21 +++++++++++++ .../test001/jack/MultiDexInstaller.java | 21 +++++++++++++ .../jack/preprocessor/test001/jack/config.jpp | 36 ++++++++++++++++++++++ 15 files changed, 146 insertions(+), 146 deletions(-) delete mode 100644 jack-tests/tests/com/android/jack/annotationadder/test001/jack/Activity.java delete mode 100644 jack-tests/tests/com/android/jack/annotationadder/test001/jack/Application.java delete mode 100644 jack-tests/tests/com/android/jack/annotationadder/test001/jack/Context.java delete mode 100644 jack-tests/tests/com/android/jack/annotationadder/test001/jack/Instrumentation.java delete mode 100644 jack-tests/tests/com/android/jack/annotationadder/test001/jack/MultiDexInstaller.java delete mode 100644 jack-tests/tests/com/android/jack/annotationadder/test001/jack/config.jpp create mode 100644 jack-tests/tests/com/android/jack/preprocessor/test001/jack/Activity.java create mode 100644 jack-tests/tests/com/android/jack/preprocessor/test001/jack/Application.java create mode 100644 jack-tests/tests/com/android/jack/preprocessor/test001/jack/Context.java create mode 100644 jack-tests/tests/com/android/jack/preprocessor/test001/jack/Instrumentation.java create mode 100644 jack-tests/tests/com/android/jack/preprocessor/test001/jack/MultiDexInstaller.java create mode 100644 jack-tests/tests/com/android/jack/preprocessor/test001/jack/config.jpp (limited to 'jack-tests') diff --git a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Activity.java b/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Activity.java deleted file mode 100644 index 9094de6..0000000 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Activity.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.jack.annotationadder.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/annotationadder/test001/jack/Application.java deleted file mode 100644 index 475d8db..0000000 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Application.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.jack.annotationadder.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/annotationadder/test001/jack/Context.java deleted file mode 100644 index 2b930da..0000000 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Context.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.jack.annotationadder.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/annotationadder/test001/jack/Instrumentation.java deleted file mode 100644 index edcf7cd..0000000 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/Instrumentation.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.jack.annotationadder.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/annotationadder/test001/jack/MultiDexInstaller.java deleted file mode 100644 index 75f9c7e..0000000 --- a/jack-tests/tests/com/android/jack/annotationadder/test001/jack/MultiDexInstaller.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.jack.annotationadder.test001.jack; - -public @interface MultiDexInstaller { - -} 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 * (); - } - -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/preprocessor/test001/jack/Activity.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Activity.java new file mode 100644 index 0000000..bc176ff --- /dev/null +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Activity.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.preprocessor.test001.jack; + +public interface Activity { + +} diff --git a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Application.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Application.java new file mode 100644 index 0000000..de696f5 --- /dev/null +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Application.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.preprocessor.test001.jack; + +public class Application { + +} diff --git a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Context.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Context.java new file mode 100644 index 0000000..2a3ec17 --- /dev/null +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Context.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.preprocessor.test001.jack; + +public class Context { + +} diff --git a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Instrumentation.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Instrumentation.java new file mode 100644 index 0000000..793e6fe --- /dev/null +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/Instrumentation.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.jack.preprocessor.test001.jack; + +public class Instrumentation { + +} diff --git a/jack-tests/tests/com/android/jack/preprocessor/test001/jack/MultiDexInstaller.java b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/MultiDexInstaller.java new file mode 100644 index 0000000..eb06937 --- /dev/null +++ b/jack-tests/tests/com/android/jack/preprocessor/test001/jack/MultiDexInstaller.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +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 * (); + } + +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 + } + ; + } -- cgit v1.1