diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-09-14 00:07:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-14 00:07:44 +0000 |
| commit | 0f3e1487b26a822697f70747290809081c2072cc (patch) | |
| tree | c9722df34275ce84017c271d3ae557b3c9952282 /data | |
| parent | 236afa0d8b3e146c97801bd72a224b0908cd93f9 (diff) | |
| parent | db8c1655ea4af060967cdaef9c1bc74a1003cdc8 (diff) | |
| download | frameworks_base-0f3e1487b26a822697f70747290809081c2072cc.zip frameworks_base-0f3e1487b26a822697f70747290809081c2072cc.tar.gz frameworks_base-0f3e1487b26a822697f70747290809081c2072cc.tar.bz2 | |
Merge "Remove obsolete assets from target /system/media/video/" into klp-dev
Diffstat (limited to 'data')
| -rw-r--r-- | data/videos/VideoPackage1.mk | 10 | ||||
| -rw-r--r-- | data/videos/VideoPackage2.mk | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/data/videos/VideoPackage1.mk b/data/videos/VideoPackage1.mk index 0089657..ee3b5ed 100644 --- a/data/videos/VideoPackage1.mk +++ b/data/videos/VideoPackage1.mk @@ -19,8 +19,8 @@ LOCAL_PATH := frameworks/base/data/videos TARGET_PATH := system/media/video -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ - $(LOCAL_PATH)/AndroidInSpace.480p.lq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \ - $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \ - $(LOCAL_PATH)/Sunset.480p.lq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 +#PRODUCT_COPY_FILES += \ +# $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ +# $(LOCAL_PATH)/AndroidInSpace.480p.lq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \ +# $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \ +# $(LOCAL_PATH)/Sunset.480p.lq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 diff --git a/data/videos/VideoPackage2.mk b/data/videos/VideoPackage2.mk index b53fd9f..f799bea 100644 --- a/data/videos/VideoPackage2.mk +++ b/data/videos/VideoPackage2.mk @@ -19,8 +19,8 @@ LOCAL_PATH := frameworks/base/data/videos TARGET_PATH := system/media/video -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ - $(LOCAL_PATH)/AndroidInSpace.480p.mq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \ - $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \ - $(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 +#PRODUCT_COPY_FILES += \ +# $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ +# $(LOCAL_PATH)/AndroidInSpace.480p.mq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \ +# $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \ +# $(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 |