diff options
| author | Ying Wang <wangying@google.com> | 2013-10-02 09:34:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-02 09:34:17 -0700 |
| commit | 3990485ccbd9c19fc7f2bdb9c06ca99b97b97700 (patch) | |
| tree | 5383dd15f632d1ba0bfb2642c1a5eeebceec936f | |
| parent | a97c86d6eb8a61ba894d6ccb88ed2d738dfc8e47 (diff) | |
| parent | 26b97deaf0cb44293a5beb014abb261eb2edbd59 (diff) | |
| download | mako-3990485ccbd9c19fc7f2bdb9c06ca99b97b97700.tar.gz | |
am 26b97dea: Merge "Move the live wallpaper packages from device.mk to full_mako.mk" into klp-dev
* commit '26b97deaf0cb44293a5beb014abb261eb2edbd59':
Move the live wallpaper packages from device.mk to full_mako.mk
| -rw-r--r-- | device.mk | 7 | ||||
| -rw-r--r-- | full_mako.mk | 7 |
2 files changed, 7 insertions, 7 deletions
@@ -35,13 +35,6 @@ PRODUCT_PACKAGES += \ charger_res_images \ charger -# Live Wallpapers -PRODUCT_PACKAGES += \ - LiveWallpapers \ - LiveWallpapersPicker \ - VisualizationWallpapers \ - librs_jni - ifneq ($(findstring svelte, $(TARGET_PRODUCT)),) LOCAL_KERNEL := device/lge/mako_svelte-kernel/kernel else diff --git a/full_mako.mk b/full_mako.mk index 9616095..80e37df 100644 --- a/full_mako.mk +++ b/full_mako.mk @@ -17,6 +17,13 @@ # Sample: This is where we'd set a backup provider if we had one # $(call inherit-product, device/sample/products/backup_overlay.mk) +# Live Wallpapers +PRODUCT_PACKAGES += \ + LiveWallpapers \ + LiveWallpapersPicker \ + VisualizationWallpapers + + # Get the long list of APNs PRODUCT_COPY_FILES := device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml |