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

Commit 36331f84 authored by David 'Digit' Turner's avatar David 'Digit' Turner
Browse files

resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp 

Change-Id: If2b21def45b5de222e560af442a0ff9f56da5a35
parents eb0a62cb 09636e17

core/tasks/sdk-addon.mk

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ files_to_copy += \ 
        $(BUILT_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \

        $(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.img \

        $(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \

        $(ANDROID_PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \

        $(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt



# Generate rules to copy the requested files