Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8b9ea3d authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am edc538a7: am 0f3e1487: Merge "Remove obsolete assets from target... 

am edc538a7: am 0f3e1487: Merge "Remove obsolete assets from target /system/media/video/" into klp-dev

* commit 'edc538a7':
  Remove obsolete assets from target /system/media/video/
parents 6cc372b1 edc538a7

CleanSpec.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -180,6 +180,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/androi 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/idc/frameworks)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/idc/frameworks)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keylayout/frameworks)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keylayout/frameworks)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keychars/frameworks)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keychars/frameworks)

$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/media/video/*)

# ************************************************

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************
 
# ************************************************

data/videos/VideoPackage1.mk

+5 −5
Original line number Original line Diff line number Diff line
@@ -19,8 +19,8 @@ 
LOCAL_PATH  := frameworks/base/data/videos

LOCAL_PATH  := frameworks/base/data/videos

TARGET_PATH := system/media/video

TARGET_PATH := system/media/video





PRODUCT_COPY_FILES += \

#PRODUCT_COPY_FILES += \

        $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \

#        $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \

        $(LOCAL_PATH)/AndroidInSpace.480p.lq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.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.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \

        $(LOCAL_PATH)/Sunset.480p.lq.mp4:$(TARGET_PATH)/Sunset.480p.mp4
 
#        $(LOCAL_PATH)/Sunset.480p.lq.mp4:$(TARGET_PATH)/Sunset.480p.mp4

data/videos/VideoPackage2.mk

+5 −5
Original line number Original line Diff line number Diff line
@@ -19,8 +19,8 @@ 
LOCAL_PATH  := frameworks/base/data/videos

LOCAL_PATH  := frameworks/base/data/videos

TARGET_PATH := system/media/video

TARGET_PATH := system/media/video





PRODUCT_COPY_FILES += \

#PRODUCT_COPY_FILES += \

        $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \

#        $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \

        $(LOCAL_PATH)/AndroidInSpace.480p.mq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.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.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \

        $(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4
 
#        $(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4