diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-08-13 00:57:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-08-13 00:57:42 +0000 |
| commit | c80d449f19b08cbc74d28235a19baf85b2d6f8c7 (patch) | |
| tree | ca44c9e63f82faadae36e447a86d834489003afc | |
| parent | 9f185433f6e97802ab0e2e012440ce5229077ac9 (diff) | |
| parent | 7f88915dc52e6db118a3536a0f00e0f59b3e4e3f (diff) | |
| download | android_packages_apps_WallpaperPicker2-c80d449f19b08cbc74d28235a19baf85b2d6f8c7.tar.gz android_packages_apps_WallpaperPicker2-c80d449f19b08cbc74d28235a19baf85b2d6f8c7.tar.bz2 android_packages_apps_WallpaperPicker2-c80d449f19b08cbc74d28235a19baf85b2d6f8c7.zip | |
Merge "Make WallpaperPicker2 unbundled Bug: 136199516" into ub-launcher3-master
| -rwxr-xr-x | Android.mk | 27 | ||||
| -rw-r--r-- | libs/style_protos.jar | bin | 53134 -> 0 bytes |
2 files changed, 2 insertions, 25 deletions
@@ -16,18 +16,6 @@ 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 @@ -100,14 +88,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PROGUARD_ENABLED := disabled LOCAL_MANIFEST_FILE := AndroidManifest.xml -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_SDK_VERSION := current LOCAL_MODULE := WallpaperPicker2CommonDepsLib LOCAL_PRIVILEGED_MODULE := true @@ -132,11 +113,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PROGUARD_ENABLED := disabled -ifneq (,$(wildcard frameworks/base)) - LOCAL_PRIVATE_PLATFORM_APIS := true -else - LOCAL_SDK_VERSION := system_current -endif +LOCAL_SDK_VERSION := system_current LOCAL_PACKAGE_NAME := WallpaperPicker2 LOCAL_JETIFIER_ENABLED := true diff --git a/libs/style_protos.jar b/libs/style_protos.jar Binary files differdeleted file mode 100644 index 8708555..0000000 --- a/libs/style_protos.jar +++ /dev/null |