summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2019-04-03 23:05:55 -0700
committerHyunyoung Song <hyunyoungs@google.com>2019-04-03 23:07:13 -0700
commit3f8544af9ad308b6093b70cf34eb4109e1e6dbb6 (patch)
tree4253a8457a1c236ef1fcc4d025f711cae4131a4b /Android.mk
parent5fadfe562c080d6b73e002cfba3ce3194d499c53 (diff)
downloadandroid_packages_apps_Trebuchet-3f8544af9ad308b6093b70cf34eb4109e1e6dbb6.tar.gz
android_packages_apps_Trebuchet-3f8544af9ad308b6093b70cf34eb4109e1e6dbb6.tar.bz2
android_packages_apps_Trebuchet-3f8544af9ad308b6093b70cf34eb4109e1e6dbb6.zip
Move PlubinLib to prebuilts/frameworks_intermediates
Bug: 129423457 Change-Id: I7ed06609efa33ae98ffcd6f937a76a6b772c3fc1
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk15
1 files changed, 5 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk
index 06ee66fdd..a817415ea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,15 +16,6 @@
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).
#
@@ -33,7 +24,11 @@ LOCAL_USE_AAPT2 := true
LOCAL_AAPT2_ONLY := true
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES:= libPluginCore
+ifneq (,$(wildcard frameworks/base))
+ LOCAL_STATIC_JAVA_LIBRARIES:= PluginCoreLib
+else
+ LOCAL_STATIC_JAVA_LIBRARIES:= libPluginCore
+endif
LOCAL_SRC_FILES := \
$(call all-java-files-under, src_plugins)