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

Commit 64196f4a authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge remote-tracking branch 'github/cm-11.0' into HEAD

parents e1e02a36 2f2500f0

target/product/core_base.mk

+0 −4
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 
# Note that components added here will be also shared in PDK. Components

# that should not be in PDK should be added in lower level like core.mk.



PRODUCT_PROPERTY_OVERRIDES := \

    ro.config.notification_sound=OnTheHunt.ogg \

    ro.config.alarm_alert=Alarm_Classic.ogg



PRODUCT_PACKAGES += \

    ContactsProvider \

    DefaultContainerService \

tools/releasetools/img_from_target_files

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ def AddRadio(output_zip): 
    if os.path.isfile(filesmap):

      print "creating flash-radio.sh..."

      filesmap_data = open(filesmap, "r")

      filesmap_regex = re.compile(r'^(\S+)\s.+\/by-name\/(\S+)$')

      filesmap_regex = re.compile(r'^(\S+)\s\S+\/by-name\/(\S+).*')

      tmp_flash_radio = tempfile.NamedTemporaryFile()

      for filesmap_line in filesmap_data:

        filesmap_entry = filesmap_regex.search(filesmap_line)