From 708e6bc6526990f447326d13702e79d5630303b8 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Wed, 13 Jun 2012 15:17:58 -0700 Subject: Remove Disco video from builds. Bug: 6294985 Change-Id: Idde6148b94a55a27740f3b4f82c2038272f06628 --- CleanSpec.mk | 1 + data/videos/VideoPackage1.mk | 4 +--- data/videos/VideoPackage2.mk | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 539b84e..0d8a7cd 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -132,6 +132,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/accessibilityservice/IAccessibilityServiceClientCallback.java) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/accessibilityservice/IAccessibilityServiceClientCallback.P) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/accessibilityservice/IAccessibilityServiceClient.P) +$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/media/video/Disco*) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/data/videos/VideoPackage1.mk b/data/videos/VideoPackage1.mk index 407a76e..0089657 100644 --- a/data/videos/VideoPackage1.mk +++ b/data/videos/VideoPackage1.mk @@ -23,6 +23,4 @@ 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 \ - $(LOCAL_PATH)/Disco.240p.mp4:$(TARGET_PATH)/Disco.240p.mp4 \ - $(LOCAL_PATH)/Disco.480p.lq.mp4:$(TARGET_PATH)/Disco.480p.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 c256a2d..b53fd9f 100644 --- a/data/videos/VideoPackage2.mk +++ b/data/videos/VideoPackage2.mk @@ -23,6 +23,4 @@ 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 \ - $(LOCAL_PATH)/Disco.240p.mp4:$(TARGET_PATH)/Disco.240p.mp4 \ - $(LOCAL_PATH)/Disco.480p.mq.mp4:$(TARGET_PATH)/Disco.480p.mp4 + $(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 -- cgit v1.1