diff --git a/byte-buddy-gradle-plugin/android-plugin-test/.gitignore b/byte-buddy-gradle-plugin/android-plugin-test/.gitignore
new file mode 100644
index 00000000000..55b147bea55
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/.gitignore
@@ -0,0 +1,5 @@
+build/
+.gradle/
+.idea/
+local.properties
+captures/
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/README.md b/byte-buddy-gradle-plugin/android-plugin-test/README.md
index 08ad87e9168..6e73f42d2a4 100644
--- a/byte-buddy-gradle-plugin/android-plugin-test/README.md
+++ b/byte-buddy-gradle-plugin/android-plugin-test/README.md
@@ -4,22 +4,17 @@ How to run the tests
 ### Environment setup
 
 * The environment var `ANDROID_HOME` must be set and pointing to the Android SDK dir.
-* Java 11 is required, more info [here](https://developer.android.com/studio/releases/gradle-plugin#jdk-11).
-* A Gradle wrapper version of 7.2+ is required in order to be compatible with the Android
-  Gradle plugin used in this project, more info on it
-  [here](https://developer.android.com/studio/releases/gradle-plugin#updating-gradle).
-* There must be an Android device connected through [ADB](https://developer.android.com/studio/command-line/adb), either
+* Java 11 is required, more
+  info [here](https://developer.android.com/studio/releases/gradle-plugin#jdk-11).
+* There must be an Android device connected
+  through [ADB](https://developer.android.com/studio/command-line/adb), either
   a running Emulator or a real device plugged in with
   [USB debugging](https://developer.android.com/studio/command-line/adb#Enabling) enabled.
-* Set environment var `ANDROID_TEST` to `"true"`.
-
-This module is disabled by default to avoid issues with the Android Gradle Plugin and Intellij IDEA
-version incompatibility, which causes the project analysis to fail when opened with said IDE, though it doesn't
-cause any issues when running it from the command line. That's why the environment var `ANDROID_TEST` is needed
-in order to switch this module on by setting it to `"true"`.
 
 ### Steps
 
 * Build Byte Buddy alongside the Byte Buddy Gradle plugin.
-* Run the following command from the Byte Buddy Gradle plugin
+* Located in the root dir of this test project, run the following command:
   dir: `./gradlew connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=net.bytebuddy.android.test.ByteBuddyInstrumentedTest`
+* Optionally, you can also open up this test project with Android Studio, open up the test class and
+  run it through the IDE.
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarAdvice.java b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarAdvice.java
index dfd86bebf77..5bcad3b1d6f 100644
--- a/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarAdvice.java
+++ b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/aar/AarAdvice.java
@@ -29,6 +29,6 @@ public class AarAdvice {
      */
     @Advice.OnMethodExit
     public static void onExit(@Advice.Return(readOnly = false) String returned) {
-        returned = "bar";
+        returned = "instrumented local class from aar plugin";
     }
 }
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/build.gradle b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/build.gradle
index dcb7351eb66..d0ed79b9b18 100644
--- a/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/build.gradle
+++ b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/build.gradle
@@ -25,4 +25,5 @@ android {
 
 dependencies {
     implementation group: 'com.google.android.material', name: 'material', version: '1.6.1'
+    implementation project(":service-definition-lib")
 }
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/service/TargetServiceImplementation.java b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/service/TargetServiceImplementation.java
new file mode 100644
index 00000000000..9fe659434d8
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/java/net/bytebuddy/android/test/aar/lib/service/TargetServiceImplementation.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 - Present Rafael Winterhalter
+ *
+ * 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 net.bytebuddy.android.test.aar.lib.service;
+
+import com.service.definition.ServiceDefinition;
+
+public class TargetServiceImplementation implements ServiceDefinition {
+
+    @Override
+    public String getValue() {
+        return "Target service impl";
+    }
+}
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/resources/META-INF/services/com.service.definition.ServiceDefinition b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/resources/META-INF/services/com.service.definition.ServiceDefinition
new file mode 100644
index 00000000000..5a52a2cb841
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/aar-bytebuddy-target/src/main/resources/META-INF/services/com.service.definition.ServiceDefinition
@@ -0,0 +1 @@
+net.bytebuddy.android.test.aar.lib.service.TargetServiceImplementation
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/app/build.gradle b/byte-buddy-gradle-plugin/android-plugin-test/app/build.gradle
index ac04d874b13..386b93e3101 100644
--- a/byte-buddy-gradle-plugin/android-plugin-test/app/build.gradle
+++ b/byte-buddy-gradle-plugin/android-plugin-test/app/build.gradle
@@ -26,14 +26,15 @@ android {
     }
 }
 
-def outerPom = new groovy.xml.XmlSlurper().parse(rootProject.file("$rootDir/pom.xml"))
-
 dependencies {
-    implementation group: 'androidx.appcompat', name: 'appcompat', version: '1.5.0'
-    implementation project(':android-plugin-test:aar-bytebuddy-target')
-    byteBuddy project(":android-plugin-test:jar-bytebuddy-plugin")
-    byteBuddy project(":android-plugin-test:aar-bytebuddy-plugin")
+    implementation project(":service-definition-lib")
+    implementation project(':aar-bytebuddy-target')
+    implementation project(":service-implementation-lib")
+    implementation project(":service-implementation2-lib")
+    byteBuddy project(":jar-bytebuddy-plugin")
+    byteBuddy project(":aar-bytebuddy-plugin")
     testImplementation group: 'junit', name: 'junit', version: outerPom.properties.'version.junit'
-    androidTestImplementation group: 'androidx.test.ext', name: 'junit', version: '1.1.3'
-    androidTestImplementation group: 'androidx.test.espresso', name: 'espresso-core', version: '3.4.0'
+    androidTestImplementation group: 'androidx.test', name: 'rules', version: '1.5.0'
+    androidTestImplementation group: 'androidx.test', name: 'runner', version: '1.5.2'
+    androidTestImplementation group: 'androidx.test.ext', name: 'junit', version: '1.1.5'
 }
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/app/src/androidTest/java/net/bytebuddy/android/test/ByteBuddyInstrumentedTest.java b/byte-buddy-gradle-plugin/android-plugin-test/app/src/androidTest/java/net/bytebuddy/android/test/ByteBuddyInstrumentedTest.java
index 0ead9aa097a..472475656d0 100644
--- a/byte-buddy-gradle-plugin/android-plugin-test/app/src/androidTest/java/net/bytebuddy/android/test/ByteBuddyInstrumentedTest.java
+++ b/byte-buddy-gradle-plugin/android-plugin-test/app/src/androidTest/java/net/bytebuddy/android/test/ByteBuddyInstrumentedTest.java
@@ -1,30 +1,37 @@
 package net.bytebuddy.android.test;
 
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-import androidx.test.ext.junit.rules.ActivityScenarioRule;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.service.definition.ServiceDefinition;
+
+import net.bytebuddy.android.test.aar.lib.SomeAarClass;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
-@RunWith(AndroidJUnit4.class)
-class ByteBuddyInstrumentedTest {
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ServiceLoader;
 
-    @Rule
-    public ActivityScenarioRule<MainActivity> activityRule = new ActivityScenarioRule<>(MainActivity.class);
+public class ByteBuddyInstrumentedTest {
 
     @Test
     public void bytecodeInstrumentation() {
-        // On local java
-        onView(withId(R.id.text_from_local_java_class)).check(matches(withText("bar")));
-        // On dependency class
-        onView(withId(R.id.text_from_aar_dependency)).check(matches(withText("bar")));
-        // From aar
-        onView(withId(R.id.text_instrumented_from_aar)).check(matches(withText("bar")));
+        assertEquals("instrumented local class from jar plugin", new SomeClass().method());
+        assertEquals("instrumented local class from aar plugin", new AnotherClass().method());
+        assertEquals("instrumented aar lib's class from jar plugin", new SomeAarClass().method());
+    }
+
+    @Test
+    public void verifySPIsAreNotMissing() {
+        List<String> values = new ArrayList<>();
+        for (ServiceDefinition serviceDefinition : ServiceLoader.load(ServiceDefinition.class)) {
+            values.add(serviceDefinition.getValue());
+        }
+
+        assertEquals(3, values.size());
+        assertTrue(values.contains("Target service impl"));
+        assertTrue(values.contains("Service implementation"));
+        assertTrue(values.contains("Service implementation2"));
     }
 }
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/AndroidManifest.xml b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/AndroidManifest.xml
index bdf383e9b47..4d2e630d7d9 100644
--- a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/AndroidManifest.xml
+++ b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/AndroidManifest.xml
@@ -1,21 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="net.bytebuddy.android.test">
-    <application
-            android:allowBackup="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
-            android:roundIcon="@mipmap/ic_launcher_round"
-            android:supportsRtl="true"
-            android:theme="@style/Theme.Bytebuddygradleplugin">
-        <activity
-                android:name=".MainActivity"
-                android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
+<manifest package="net.bytebuddy.android.test" />
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/MainActivity.java b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/MainActivity.java
deleted file mode 100644
index 48dd5315404..00000000000
--- a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/java/net/bytebuddy/android/test/MainActivity.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2014 - Present Rafael Winterhalter
- *
- * 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 net.bytebuddy.android.test;
-
-import android.os.Bundle;
-import android.widget.TextView;
-
-import androidx.annotation.IdRes;
-import androidx.appcompat.app.AppCompatActivity;
-
-import net.bytebuddy.android.test.aar.lib.SomeAarClass;
-
-/**
- * The main activity to use under test.
- */
-public class MainActivity extends AppCompatActivity {
-
-    /**
-     * {@inheritDoc}
-     */
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        setTextTo(R.id.text_from_local_java_class, new SomeClass().someMethod());
-        setTextTo(R.id.text_from_aar_dependency, new SomeAarClass().someMethod());
-        setTextTo(R.id.text_instrumented_from_aar, new AnotherClass().someMethod());
-    }
-
-    /**
-     * Sets a resource text to a given value.
-     *
-     * @param id   The text id.
-     * @param text The text to set.
-     */
-    private void setTextTo(@IdRes int id, String text) {
-        TextView textView = findViewById(id);
-        textView.setText(text);
-    }
-}
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/layout/activity_main.xml b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index bcd2967ea73..00000000000
--- a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:id="@+id/text_from_local_java_class"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!" />
-
-    <TextView
-        android:id="@+id/text_from_aar_dependency"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!" />
-
-    <TextView
-        android:id="@+id/text_instrumented_from_aar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!" />
-</LinearLayout>
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d64e58..00000000000
Binary files a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611da081..00000000000
Binary files a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/colors.xml b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/colors.xml
deleted file mode 100644
index ca1931bca99..00000000000
--- a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/strings.xml b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/strings.xml
deleted file mode 100644
index b02be6da869..00000000000
--- a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">app</string>
-</resources>
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/themes.xml b/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/themes.xml
deleted file mode 100644
index 227462dcdf0..00000000000
--- a/byte-buddy-gradle-plugin/android-plugin-test/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Bytebuddygradleplugin" parent="Theme.AppCompat.Light.DarkActionBar"/>
-</resources>
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/build.gradle b/byte-buddy-gradle-plugin/android-plugin-test/build.gradle
index 2a294826719..52d8aa96b50 100644
--- a/byte-buddy-gradle-plugin/android-plugin-test/build.gradle
+++ b/byte-buddy-gradle-plugin/android-plugin-test/build.gradle
@@ -1,13 +1,19 @@
 buildscript {
-    def pom = new groovy.xml.XmlSlurper().parse(rootProject.file('pom.xml'))
-    def version = pom.parent.version.text().toString()
+    ext {
+        outerPom = new groovy.xml.XmlSlurper().parse(rootProject.file('../pom.xml'))
+        byteBuddyVersion = outerPom.parent.version.text().toString()
+    }
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
-        classpath group: 'com.android.tools.build', name: 'gradle', version: '7.2.0'
-        classpath files(new File("${rootProject.buildDir}/libs/byte-buddy-gradle-plugin-${version}.jar").canonicalFile)
+        classpath group: 'com.android.tools.build', name: 'gradle', version: '7.4.0'
+
+        def byteBuddyPlugin = new File("${rootDir}/../build/libs/byte-buddy-gradle-plugin-${byteBuddyVersion}.jar").canonicalFile
+        def byteBuddyLib = new File("$rootDir/../../byte-buddy/target/byte-buddy-${byteBuddyVersion}.jar").canonicalFile
+        classpath files(byteBuddyPlugin)
+        classpath files(byteBuddyLib.absolutePath)
     }
 }
 
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/bytebuddy.gradle b/byte-buddy-gradle-plugin/android-plugin-test/bytebuddy.gradle
new file mode 100644
index 00000000000..624f05bd848
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/bytebuddy.gradle
@@ -0,0 +1,4 @@
+dependencies {
+    def location = new File("$rootDir/../../byte-buddy/target/byte-buddy-${byteBuddyVersion}.jar").canonicalFile
+    implementation files(location.absolutePath)
+}
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/gradle.properties b/byte-buddy-gradle-plugin/android-plugin-test/gradle.properties
new file mode 100644
index 00000000000..5bac8ac5046
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/gradle.properties
@@ -0,0 +1 @@
+android.useAndroidX=true
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/gradlew b/byte-buddy-gradle-plugin/android-plugin-test/gradlew
new file mode 100755
index 00000000000..17c983f338d
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/gradlew
@@ -0,0 +1,359 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# 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
+#
+#      https://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.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#   (Modified for the purposes of building Byte Buddy)
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+# Use legacy Gradle if Java 6 or 7 is used to build (Byte Buddy edit)
+if $JAVA_HOME/bin/java -fullversion 2>&1 >/dev/null | awk '{print $4}' | grep -Eq "^\"1\.[67]\."; then
+  WRAPPER_LOCATION="wrapper-legacy"
+  GRADLE_ADDITIONAL_OPTS="--build-file=build.legacy.gradle"
+else
+  WRAPPER_LOCATION="wrapper"
+  GRADLE_ADDITIONAL_OPTS=""
+fi
+
+# Download Gradle distribution if specified (Byte Buddy edit)
+DISTRIBUTION_LOCATION=""
+DISTRIBUTION_URL=""
+while IFS="=" read key value; do
+  case "$key" in
+              distributionRepo) DISTRIBUTION_LOCATION="$value";;
+              distributionUrl) DISTRIBUTION_URL="$value";;
+  esac
+done < "$APP_HOME/gradle/$WRAPPER_LOCATION/gradle-wrapper.properties"
+if [ -n "$DISTRIBUTION_LOCATION" ]; then
+  if [ -r "$APP_HOME/gradle/$WRAPPER_LOCATION/$DISTRIBUTION_URL" ]; then
+      if [ "$GRADLEW_VERBOSE" = true ]; then
+        echo "Found gradle/$WRAPPER_LOCATION/$DISTRIBUTION_URL"
+      fi
+  else
+      echo "Couldn't find gradle/$WRAPPER_LOCATION/$DISTRIBUTION_URL, downloading it ..."
+      if [ "$GRADLEW_VERBOSE" = true ]; then
+        echo "Downloading from: $DISTRIBUTION_LOCATION/$DISTRIBUTION_URL"
+      fi
+      GRADLE_BIN_PATH="$APP_HOME/gradle/$WRAPPER_LOCATION/$DISTRIBUTION_URL"
+      if $cygwin; then
+        GRADLE_BIN_PATH=$(cygpath --path --windows "$GRADLE_BIN_PATH")
+      fi
+      GRADLE_REMOTE_URL=$DISTRIBUTION_LOCATION/$DISTRIBUTION_URL
+      if command -v wget > /dev/null; then
+          QUIET="--quiet"
+          if [ "$GRADLEW_VERBOSE" = true ]; then
+            echo "Found wget ... using wget"
+            QUIET=""
+          fi
+          if [ -z "$GRADLEW_USERNAME" ] || [ -z "$GRADLEW_PASSWORD" ]; then
+              wget $QUIET "$GRADLE_REMOTE_URL" -O "$GRADLE_BIN_PATH"
+          else
+              wget $QUIET --http-user="$GRADLEW_USERNAME" --http-password="$GRADLEW_PASSWORD" "$GRADLE_REMOTE_URL" -O "$GRADLE_BIN_PATH"
+          fi
+          [ $? -eq 0 ] || rm -f "$GRADLE_BIN_PATH"
+      elif command -v curl > /dev/null; then
+          QUIET="--silent"
+          if [ "$GRADLEW_VERBOSE" = true ]; then
+            echo "Found curl ... using curl"
+            QUIET=""
+          fi
+          if [ -z "$GRADLEW_USERNAME" ] || [ -z "$GRADLEW_PASSWORD" ]; then
+              curl $QUIET -o "$GRADLE_BIN_PATH" "$GRADLE_REMOTE_URL" -f -L
+          else
+              curl $QUIET --user "$GRADLEW_USERNAME:$GRADLEW_PASSWORD" -o "$GRADLE_BIN_PATH" "$GRADLE_REMOTE_URL" -f -L
+          fi
+          [ $? -eq 0 ] || rm -f "$GRADLE_BIN_PATH"
+      else
+        echo "Failed to download Gradle distribution from $GRADLE_REMOTE_URL"
+        exit 1
+      fi
+  fi
+fi
+
+# Download and validate the Gradle wrapper (Byte Buddy edit)
+WRAPPER_URL=""
+WRAPPER_HASH=""
+while IFS="=" read key value; do
+  case "$key" in
+              wrapperUrl) WRAPPER_URL="$value";;
+              wrapperHash) WRAPPER_HASH="$value";;
+  esac
+done < "$APP_HOME/gradle/$WRAPPER_LOCATION/gradle-wrapper.properties"
+if [ -n "$WRAPPER_URL" ]; then
+    if [ -r "$APP_HOME/gradle/$WRAPPER_LOCATION/gradle-wrapper.jar" ]; then
+        if [ "$GRADLEW_VERBOSE" = true ]; then
+          echo "Found gradle/$WRAPPER_LOCATION/gradle-wrapper.jar"
+        fi
+    else
+        echo "Couldn't find gradle/$WRAPPER_LOCATION/gradle-wrapper.jar, downloading it ..."
+        if [ "$GRADLEW_VERBOSE" = true ]; then
+          echo "Downloading from: $WRAPPER_URL"
+        fi
+        GRADLE_WRAPPER_PATH="$APP_HOME/gradle/$WRAPPER_LOCATION/gradle-wrapper.jar"
+        if $cygwin; then
+          GRADLE_WRAPPER_PATH=$(cygpath --path --windows "$GRADLE_WRAPPER_PATH")
+        fi
+        if command -v wget > /dev/null; then
+            QUIET="--quiet"
+            if [ "$GRADLEW_VERBOSE" = true ]; then
+              echo "Found wget ... using wget"
+              QUIET=""
+            fi
+            if [ -z "$GRADLEW_USERNAME" ] || [ -z "$GRADLEW_PASSWORD" ]; then
+                wget $QUIET "$WRAPPER_URL" -O "$GRADLE_WRAPPER_PATH"
+            else
+                wget $QUIET --http-user="$GRADLEW_USERNAME" --http-password="$GRADLEW_PASSWORD" "$WRAPPER_URL" -O "$GRADLE_WRAPPER_PATH"
+            fi
+            [ $? -eq 0 ] || rm -f "$GRADLE_WRAPPER_PATH"
+        elif command -v curl > /dev/null; then
+            QUIET="--silent"
+            if [ "$GRADLEW_VERBOSE" = true ]; then
+              echo "Found curl ... using curl"
+              QUIET=""
+            fi
+            if [ -z "$GRADLEW_USERNAME" ] || [ -z "$GRADLEW_PASSWORD" ]; then
+                curl $QUIET -o "$GRADLE_WRAPPER_PATH" "$WRAPPER_URL" -f -L
+            else
+                curl $QUIET --user "$GRADLEW_USERNAME:$GRADLEW_PASSWORD" -o "$GRADLE_WRAPPER_PATH" "$WRAPPER_URL" -f -L
+            fi
+            [ $? -eq 0 ] || rm -f "$GRADLE_WRAPPER_PATH"
+        else
+          echo "Failed to download Gradle wrapper from $WRAPPER_URL"
+          exit 1
+        fi
+    fi
+fi
+if [ -n "$WRAPPER_HASH" ]; then
+  if ! echo "$WRAPPER_HASH  $APP_HOME/gradle/$WRAPPER_LOCATION/gradle-wrapper.jar" | shasum -a 256 -c > /dev/null; then
+    echo "Could not validate hash of gradle-wrapper.jar";
+    exit 1
+  fi
+fi
+
+CLASSPATH=$APP_HOME/gradle/$WRAPPER_LOCATION/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        $GRADLE_ADDITIONAL_OPTS \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/gradlew.bat b/byte-buddy-gradle-plugin/android-plugin-test/gradlew.bat
new file mode 100644
index 00000000000..3b00805be74
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/gradlew.bat
@@ -0,0 +1,181 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem  (Modified for the purposes of building Byte Buddy)
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+
+@rem Use legacy Gradle if Java 6 or 7 is used to build (Byte Buddy edit)
+set WRAPPER_LOCATION=wrapper-legacy
+set GRADLE_LEGACY="true"
+for /f tokens^=2-5^ delims^=.-_^" %%j in ('%JAVA_HOME%\bin\java -fullversion 2^>^&1') do set "JAVA_VERSION_STRING=%%j.%%k"
+IF NOT "%JAVA_VERSION_STRING:~0,3%"=="1.6" (
+  IF NOT "%JAVA_VERSION_STRING:~0,3%"=="1.7" (
+    set WRAPPER_LOCATION=wrapper
+    set GRADLE_LEGACY="false"
+  )
+)
+
+@rem Extension to allow automatically downloading the Gradle binary from Gradle's repository
+@rem This is implemented similarly to the Maven Wrapper's download routine.
+SET DISTRIBUTION_LOCATION=""
+SET DISTRIBUTION_URL=""
+for /f "usebackq tokens=1,2 delims==" %%A in ("%APP_HOME%\gradle\%WRAPPER_LOCATION%\gradle-wrapper.properties") do (
+    if "%%A"=="distributionRepo" SET DISTRIBUTION_LOCATION=%%B
+    if "%%A"=="distributionUrl" SET DISTRIBUTION_URL=%%B
+)
+SET DISTRIBUTION_SOURCE=%DISTRIBUTION_LOCATION%/%DISTRIBUTION_URL%
+SET DISTRIBUTION_TARGET=%APP_HOME%\gradle\%WRAPPER_LOCATION%\%DISTRIBUTION_URL%
+if not %DISTRIBUTION_LOCATION%=="" (
+    if exist "%DISTRIBUTION_TARGET%" (
+        if "%GRADLEW_VERBOSE%" == "true" (
+            echo Found %DISTRIBUTION_TARGET%
+        )
+    ) else (
+        if "%GRADLEW_VERBOSE%" == "true" (
+            echo Couldn't find %DISTRIBUTION_TARGET%, downloading it ...
+            echo Downloading from: %DISTRIBUTION_SOURCE%
+        )
+    
+        powershell -Command "&{"^
+            "$webclient = new-object System.Net.WebClient;"^
+            "if (-not ([string]::IsNullOrEmpty('%GRADLEW_USERNAME%') -and [string]::IsNullOrEmpty('%GRADLEW_PASSWORD%'))) {"^
+            "$webclient.Credentials = new-object System.Net.NetworkCredential('%GRADLEW_USERNAME%', '%GRADLEW_PASSWORD%');"^
+            "}"^
+            "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DISTRIBUTION_SOURCE%', '%DISTRIBUTION_TARGET%')"^
+            "}"
+        if "%GRADLEW_VERBOSE%" == "true" (
+            echo Finished downloading %DISTRIBUTION_TARGET%
+        )
+    )
+)
+@rem End of extension
+
+@REM Download and validate the Gradle wrapper (Byte Buddy edit)
+SET WRAPPER_URL=""
+SET WRAPPER_HASH=""
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%APP_HOME%\gradle\%WRAPPER_LOCATION%\gradle-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
+    IF "%%A"=="wrapperHash" SET WRAPPER_HASH=%%B
+)
+SET WRAPPER_TARGET="%APP_HOME%\gradle\%WRAPPER_LOCATION%\gradle-wrapper.jar"
+if not %WRAPPER_URL%=="" (
+    if exist "%WRAPPER_URL%" (
+        if "%GRADLEW_VERBOSE%" == "true" (
+            echo Found %WRAPPER_URL%
+        )
+    ) else (
+        if "%GRADLEW_VERBOSE%" == "true" (
+            echo Couldn't find %WRAPPER_TARGET%, downloading it ...
+            echo Downloading from: %WRAPPER_URL%
+        )
+
+        powershell -Command "&{"^
+            "$webclient = new-object System.Net.WebClient;"^
+            "if (-not ([string]::IsNullOrEmpty('%GRADLEW_USERNAME%') -and [string]::IsNullOrEmpty('%GRADLEW_PASSWORD%'))) {"^
+            "$webclient.Credentials = new-object System.Net.NetworkCredential('%GRADLEW_USERNAME%', '%GRADLEW_PASSWORD%');"^
+            "}"^
+            "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_TARGET%')"^
+            "}"
+        if "%GRADLEW_VERBOSE%" == "true" (
+            echo Finished downloading %WRAPPER_TARGET%
+        )
+    )
+)
+IF NOT %WRAPPER_HASH%=="" (
+    powershell -Command "&{"^
+       "$CHECKSUM = (Invoke-Expression \"certUtil -hashfile '%APP_HOME%\gradle\%WRAPPER_LOCATION%\gradle-wrapper.jar' SHA256\" | Select -Index 1);"^
+       "If('%WRAPPER_HASH%' -ne $CHECKSUM){"^
+       "  Write-Output 'Error: Failed to validate Maven checksum extension SHA-256, it might be compromised';"^
+       "  Write-Output 'Investigate or delete %MAVEN_PROJECTBASEDIR%\.mvn\%WRAPPER_LOCATION%\maven-wrapper.jar to attempt a clean download.';"^
+       "  exit 1;"^
+       "}"^
+       "}"
+)
+
+@rem Setup the command line
+set CLASSPATH=%APP_HOME%\gradle\%WRAPPER_LOCATION%\gradle-wrapper.jar
+
+@rem Execute Gradle
+if %GRADLE_LEGACY%=="true" (
+  "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain --build-file=build.legacy.gradle %*
+) else (
+  "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+)
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/AdviceForLibClass.java b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/AdviceForLibClass.java
new file mode 100644
index 00000000000..0fdecaceda8
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/AdviceForLibClass.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 - Present Rafael Winterhalter
+ *
+ * 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 net.bytebuddy.plugin.gradle.test.jar;
+
+import net.bytebuddy.asm.Advice;
+
+/**
+ * A sample advice class.
+ */
+public class AdviceForLibClass {
+
+    /**
+     * Applies an exit advice.
+     *
+     * @param returned The return value.
+     */
+    @Advice.OnMethodExit
+    public static void enter(@Advice.Return(readOnly = false) String returned) {
+        returned = "instrumented aar lib's class from jar plugin";
+    }
+}
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarAdvice.java b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/AdviceForLocalClass.java
similarity index 90%
rename from byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarAdvice.java
rename to byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/AdviceForLocalClass.java
index b4f8111e85e..e737d251420 100644
--- a/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarAdvice.java
+++ b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/AdviceForLocalClass.java
@@ -20,7 +20,7 @@
 /**
  * A sample advice class.
  */
-public class JarAdvice {
+public class AdviceForLocalClass {
 
     /**
      * Applies an exit advice.
@@ -29,6 +29,6 @@ public class JarAdvice {
      */
     @Advice.OnMethodExit
     public static void enter(@Advice.Return(readOnly = false) String returned) {
-        returned = "bar";
+        returned = "instrumented local class from jar plugin";
     }
 }
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarPlugin.java b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/PluginForLibClass.java
similarity index 71%
rename from byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarPlugin.java
rename to byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/PluginForLibClass.java
index 0990e6f7276..b6eacb89be6 100644
--- a/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/JarPlugin.java
+++ b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/PluginForLibClass.java
@@ -16,31 +16,35 @@
 package net.bytebuddy.plugin.gradle.test.jar;
 
 import net.bytebuddy.asm.Advice;
+import net.bytebuddy.build.AndroidDescriptor;
 import net.bytebuddy.build.Plugin;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.dynamic.ClassFileLocator;
 import net.bytebuddy.dynamic.DynamicType;
 import net.bytebuddy.matcher.ElementMatchers;
 
-import java.io.IOException;
-
 /**
  * A sample plugin for instrumenting a jar file.
  */
-public class JarPlugin implements Plugin {
+public class PluginForLibClass implements Plugin {
+    private final AndroidDescriptor androidDescriptor;
+
+    public PluginForLibClass(AndroidDescriptor androidDescriptor) {
+        this.androidDescriptor = androidDescriptor;
+    }
 
     /**
      * {@inheritDoc}
      */
     public boolean matches(TypeDescription typeDefinitions) {
-        return typeDefinitions.getSimpleName().contains("Some");
+        return typeDefinitions.getSimpleName().contains("Some") && androidDescriptor.getTypeScope(typeDefinitions).equals(AndroidDescriptor.TypeScope.EXTERNAL);
     }
 
     /**
      * {@inheritDoc}
      */
     public DynamicType.Builder<?> apply(DynamicType.Builder<?> builder, TypeDescription typeDescription, ClassFileLocator classFileLocator) {
-        return builder.visit(Advice.to(JarAdvice.class).on(ElementMatchers.named("method")));
+        return builder.visit(Advice.to(AdviceForLibClass.class).on(ElementMatchers.named("method")));
     }
 
     /**
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/PluginForLocalClass.java b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/PluginForLocalClass.java
new file mode 100644
index 00000000000..c4550be813c
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/java/net/bytebuddy/plugin/gradle/test/jar/PluginForLocalClass.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 - Present Rafael Winterhalter
+ *
+ * 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 net.bytebuddy.plugin.gradle.test.jar;
+
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.build.AndroidDescriptor;
+import net.bytebuddy.build.Plugin;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.dynamic.ClassFileLocator;
+import net.bytebuddy.dynamic.DynamicType;
+import net.bytebuddy.matcher.ElementMatchers;
+
+/**
+ * A sample plugin for instrumenting a jar file.
+ */
+public class PluginForLocalClass implements Plugin {
+    private final AndroidDescriptor androidDescriptor;
+
+    public PluginForLocalClass(AndroidDescriptor androidDescriptor) {
+        this.androidDescriptor = androidDescriptor;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean matches(TypeDescription typeDefinitions) {
+        return typeDefinitions.getSimpleName().contains("Some") && androidDescriptor.getTypeScope(typeDefinitions).equals(AndroidDescriptor.TypeScope.LOCAL);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public DynamicType.Builder<?> apply(DynamicType.Builder<?> builder, TypeDescription typeDescription, ClassFileLocator classFileLocator) {
+        return builder.visit(Advice.to(AdviceForLocalClass.class).on(ElementMatchers.named("method")));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void close() {
+        /* do nothing */
+    }
+}
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins
index f99250b39c1..fb765fcd761 100644
--- a/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins
+++ b/byte-buddy-gradle-plugin/android-plugin-test/jar-bytebuddy-plugin/src/main/resources/META-INF/net.bytebuddy/build.plugins
@@ -1 +1,2 @@
-net.bytebuddy.plugin.gradle.test.jar.JarPlugin
+net.bytebuddy.plugin.gradle.test.jar.PluginForLocalClass
+net.bytebuddy.plugin.gradle.test.jar.PluginForLibClass
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-definition-lib/build.gradle b/byte-buddy-gradle-plugin/android-plugin-test/service-definition-lib/build.gradle
new file mode 100644
index 00000000000..46daca3f3bd
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/service-definition-lib/build.gradle
@@ -0,0 +1,8 @@
+plugins {
+    id "java-library"
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-definition-lib/src/main/java/com/service/definition/ServiceDefinition.java b/byte-buddy-gradle-plugin/android-plugin-test/service-definition-lib/src/main/java/com/service/definition/ServiceDefinition.java
new file mode 100644
index 00000000000..f2a1501af05
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/service-definition-lib/src/main/java/com/service/definition/ServiceDefinition.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014 - Present Rafael Winterhalter
+ *
+ * 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.service.definition;
+
+public interface ServiceDefinition {
+
+    String getValue();
+}
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/build.gradle b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/build.gradle
new file mode 100644
index 00000000000..bd81da7640a
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/build.gradle
@@ -0,0 +1,12 @@
+plugins {
+    id "java-library"
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+dependencies {
+    implementation project(":service-definition-lib")
+}
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/java/com/service/usage/ServiceImplementation.java b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/java/com/service/usage/ServiceImplementation.java
new file mode 100644
index 00000000000..ffd92274427
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/java/com/service/usage/ServiceImplementation.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 - Present Rafael Winterhalter
+ *
+ * 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.service.usage;
+
+import com.service.definition.ServiceDefinition;
+
+public class ServiceImplementation implements ServiceDefinition {
+    @Override
+    public String getValue() {
+        return "Service implementation";
+    }
+}
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/META-INF/services/com.service.definition.ServiceDefinition b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/META-INF/services/com.service.definition.ServiceDefinition
new file mode 100644
index 00000000000..c44f27b5284
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation-lib/src/main/resources/META-INF/services/com.service.definition.ServiceDefinition
@@ -0,0 +1 @@
+com.service.usage.ServiceImplementation
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/build.gradle b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/build.gradle
new file mode 100644
index 00000000000..bd81da7640a
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/build.gradle
@@ -0,0 +1,12 @@
+plugins {
+    id "java-library"
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+dependencies {
+    implementation project(":service-definition-lib")
+}
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/java/com/service/usage2/ServiceImplementation.java b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/java/com/service/usage2/ServiceImplementation.java
new file mode 100644
index 00000000000..cb0badac22f
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/java/com/service/usage2/ServiceImplementation.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 - Present Rafael Winterhalter
+ *
+ * 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.service.usage2;
+
+import com.service.definition.ServiceDefinition;
+
+public class ServiceImplementation implements ServiceDefinition {
+    @Override
+    public String getValue() {
+        return "Service implementation2";
+    }
+}
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/META-INF/services/com.service.definition.ServiceDefinition b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/META-INF/services/com.service.definition.ServiceDefinition
new file mode 100644
index 00000000000..3fcbb28e79a
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/service-implementation2-lib/src/main/resources/META-INF/services/com.service.definition.ServiceDefinition
@@ -0,0 +1 @@
+com.service.usage2.ServiceImplementation
\ No newline at end of file
diff --git a/byte-buddy-gradle-plugin/android-plugin-test/settings.gradle b/byte-buddy-gradle-plugin/android-plugin-test/settings.gradle
new file mode 100644
index 00000000000..c2548ff7dc6
--- /dev/null
+++ b/byte-buddy-gradle-plugin/android-plugin-test/settings.gradle
@@ -0,0 +1,7 @@
+include ":app"
+include ":aar-bytebuddy-target"
+include ":aar-bytebuddy-plugin"
+include ":jar-bytebuddy-plugin"
+include ":service-definition-lib"
+include ":service-implementation-lib"
+include ":service-implementation2-lib"
diff --git a/byte-buddy/src/main/resources/ByteBuddyAndroidPlugin.java b/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyAndroidPlugin.java
similarity index 100%
rename from byte-buddy/src/main/resources/ByteBuddyAndroidPlugin.java
rename to byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyAndroidPlugin.java
diff --git a/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java b/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java
index 42ea34ea97e..7b03a5f0523 100644
--- a/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java
+++ b/byte-buddy-gradle-plugin/android-plugin/src/main/java/net/bytebuddy/build/gradle/android/ByteBuddyLocalClassesEnhancerTask.java
@@ -37,7 +37,6 @@
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.logging.Logger;
-import org.gradle.api.logging.Logging;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Input;
@@ -167,7 +166,7 @@ public void execute() {
                     try {
                         buildLogger = (BuildLogger) Class.forName("net.bytebuddy.build.gradle.GradleBuildLogger")
                                 .getConstructor(Logger.class)
-                                .newInstance(getProject().getLogger());
+                                .newInstance(getLogger());
                     } catch (Exception exception) {
                         throw new GradleException("Failed to resolve Gradle build logger", exception);
                     }
@@ -180,8 +179,8 @@ public void execute() {
                             }
                             factories.add(new Plugin.Factory.UsingReflection(type)
                                     .with(Plugin.Factory.UsingReflection.ArgumentResolver.ForType.of(AndroidDescriptor.class, androidDescriptor))
-                                    .with(Plugin.Factory.UsingReflection.ArgumentResolver.ForType.of(Logger.class, getProject().getLogger()))
-                                    .with(Plugin.Factory.UsingReflection.ArgumentResolver.ForType.of(org.slf4j.Logger.class, getProject().getLogger()))
+                                    .with(Plugin.Factory.UsingReflection.ArgumentResolver.ForType.of(Logger.class, getLogger()))
+                                    .with(Plugin.Factory.UsingReflection.ArgumentResolver.ForType.of(org.slf4j.Logger.class, getLogger()))
                                     .with(Plugin.Factory.UsingReflection.ArgumentResolver.ForType.of(BuildLogger.class, buildLogger)));
                         } catch (Throwable throwable) {
                             throw new IllegalStateException("Cannot resolve plugin: " + name, throwable);
@@ -195,9 +194,9 @@ public void execute() {
                     if (!summary.getFailed().isEmpty()) {
                         throw new IllegalStateException(summary.getFailed() + " type transformations have failed");
                     } else if (summary.getTransformed().isEmpty()) {
-                        getProject().getLogger().info("No types were transformed during plugin execution");
+                        getLogger().info("No types were transformed during plugin execution");
                     } else {
-                        getProject().getLogger().info("Transformed {} type(s)", summary.getTransformed().size());
+                        getLogger().info("Transformed {} type(s)", summary.getTransformed().size());
                     }
                 } finally {
                     if (classLoader instanceof Closeable) {
diff --git a/byte-buddy-gradle-plugin/gradle.properties b/byte-buddy-gradle-plugin/gradle.properties
index 5c8002fe9e4..86bc023a87a 100644
--- a/byte-buddy-gradle-plugin/gradle.properties
+++ b/byte-buddy-gradle-plugin/gradle.properties
@@ -1,2 +1 @@
 org.gradle.welcome=never
-android.useAndroidX=true
diff --git a/byte-buddy-gradle-plugin/settings.gradle b/byte-buddy-gradle-plugin/settings.gradle
index b384bcba32b..5f8055e88bb 100644
--- a/byte-buddy-gradle-plugin/settings.gradle
+++ b/byte-buddy-gradle-plugin/settings.gradle
@@ -10,11 +10,4 @@ if (!raw.startsWith("1.") && raw.contains(".")) {
 // The Android plugin requires at least Java 8 and does not work with Java 9 for an obscure error.
 if (current > JavaVersion.VERSION_1_7 && current != JavaVersion.VERSION_1_9) {
     include "android-plugin"
-    if (Boolean.getBoolean("net.bytebuddy.build.gradle.android.test")) {
-        include "android-plugin-test"
-        include "android-plugin-test:app"
-        include "android-plugin-test:aar-bytebuddy-target"
-        include "android-plugin-test:aar-bytebuddy-plugin"
-        include "android-plugin-test:jar-bytebuddy-plugin"
-    }
 }