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

Commit 39de459a authored by Michael Jurka's avatar Michael Jurka
Browse files

Revert "Move wallpaper picker code to a separate directory" 

This reverts commit 8e88cb84.
parent 8e88cb84

Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -26,12 +26,8 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13



LOCAL_SRC_FILES := $(call all-java-files-under, src) \

    $(call all-java-files-under, wallpaper_picker_src) \

    $(call all-renderscript-files-under, src) \

    $(call all-proto-files-under, protos)

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/wallpaper_picker_res $(LOCAL_PATH)/res



LOCAL_AAPT_FLAGS := --auto-add-overlay



LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/

CleanSpec.mk

+0 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_interm 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)



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

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