Merge "Refactor SetWallpaperDialogFragment for reuse" into ub-launcher3-master
diff --git a/Android.mk b/Android.mk
index a6aebed..1be24fb 100755
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,18 @@
LOCAL_PATH := $(call my-dir)
+#
+# Prebuilt Java Libraries
+#
+include $(CLEAR_VARS)
+LOCAL_MODULE := libStyleProtos
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_SRC_FILES := libs/style_protos.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_SDK_VERSION := current
+include $(BUILD_PREBUILT)
+
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE := wallpaper2-glide-target
@@ -85,7 +97,14 @@
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_MANIFEST_FILE := AndroidManifest.xml
-LOCAL_SDK_VERSION := current
+
+ifneq (,$(wildcard frameworks/base))
+ LOCAL_STATIC_JAVA_LIBRARIES += SystemUISharedLib styleprotosnano
+ LOCAL_PRIVATE_PLATFORM_APIS := true
+else
+ LOCAL_STATIC_JAVA_LIBRARIES += libSharedSystemUI libStyleProtos
+ LOCAL_SDK_VERSION := current
+endif
LOCAL_MODULE := WallpaperPicker2CommonDepsLib
LOCAL_PRIVILEGED_MODULE := true
@@ -111,8 +130,12 @@
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_SDK_VERSION := current
+ifneq (,$(wildcard frameworks/base))
+ LOCAL_PRIVATE_PLATFORM_APIS := true
+else
+ LOCAL_SDK_VERSION := current
+endif
LOCAL_PACKAGE_NAME := WallpaperPicker2
LOCAL_JETIFIER_ENABLED := true
-include $(BUILD_PACKAGE)
\ No newline at end of file
+include $(BUILD_PACKAGE)
diff --git a/libs/style_protos.jar b/libs/style_protos.jar
new file mode 100644
index 0000000..8708555
--- /dev/null
+++ b/libs/style_protos.jar
Binary files differ