diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2019-03-22 22:42:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-22 22:42:19 +0000 |
commit | c885f9a1f30417b86f04b97bef555e7487c6c375 (patch) | |
tree | e8ea1b199feace45bd1043591b85952a051a493c | |
parent | b0058e12e91339581e0553fe1f9620bf3301e8eb (diff) | |
parent | 40bea55b7538f5cbeff91a90dc686565eda442e7 (diff) | |
download | android_packages_apps_Trebuchet-c885f9a1f30417b86f04b97bef555e7487c6c375.tar.gz android_packages_apps_Trebuchet-c885f9a1f30417b86f04b97bef555e7487c6c375.tar.bz2 android_packages_apps_Trebuchet-c885f9a1f30417b86f04b97bef555e7487c6c375.zip |
Merge "Move plugin_core.jar back to Launcher3 to unblock code merge" into ub-launcher3-master
-rw-r--r-- | Android.mk | 9 | ||||
-rw-r--r-- | libs/plugin_core.jar | bin | 0 -> 5057 bytes | |||
-rw-r--r-- | tests/Android.mk | 10 |
3 files changed, 14 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index 25593e642..b3b1c825f 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 Binary files differnew file mode 100644 index 000000000..dd27f86fa --- /dev/null +++ b/libs/plugin_core.jar diff --git a/tests/Android.mk b/tests/Android.mk index bf5cb2933..b9b703d02 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -28,12 +28,12 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 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 |