Move plugin_core.jar back to Launcher3 to unblock code merge

Change-Id: Ic9d6ab16ac7a8c5c1f528bdcac06e56f718a3f91
diff --git a/Android.mk b/Android.mk
index 25593e6..b3b1c82 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,15 @@
 
 LOCAL_PATH := $(call my-dir)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := libPluginCore
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_SRC_FILES := libs/plugin_core.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SDK_VERSION := current
+include $(BUILD_PREBUILT)
+
 #
 # Build rule for plugin lib (needed to write a plugin).
 #
diff --git a/libs/plugin_core.jar b/libs/plugin_core.jar
new file mode 100644
index 0000000..dd27f86
--- /dev/null
+++ b/libs/plugin_core.jar
Binary files differ
diff --git a/tests/Android.mk b/tests/Android.mk
index bf5cb29..b9b703d 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -28,12 +28,12 @@
 ifneq (,$(wildcard frameworks/base))
 else
     LOCAL_STATIC_JAVA_LIBRARIES += libSharedSystemUI
-endif
 
-LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \
-  ../quickstep/src/com/android/quickstep/SwipeUpSetting.java \
-  ../src/com/android/launcher3/util/SecureSettingsObserver.java \
-  ../src/com/android/launcher3/TestProtocol.java \
+    LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \
+        ../quickstep/src/com/android/quickstep/SwipeUpSetting.java \
+        ../src/com/android/launcher3/util/SecureSettingsObserver.java \
+        ../src/com/android/launcher3/TestProtocol.java
+endif
 
 LOCAL_SDK_VERSION := current
 LOCAL_MODULE := ub-launcher-aosp-tapl