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

Commit 89a76d2a authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

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

parents 04073ad3 04d290c8

target/product/languages_full.mk

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


# These are all the locales that have translations and are displayable

# by TextView in this branch.

PRODUCT_LOCALES := en_US en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ pl_PL ja_JP zh_TW zh_CN zh_HK ru_RU ko_KR nb_NO es_US da_DK el_GR tr_TR pt_PT pt_BR rm_CH sv_SE bg_BG ca_ES en_GB fi_FI hi_IN hr_HR hu_HU in_ID iw_IL lt_LT lv_LV ro_RO sk_SK sl_SI sr_RS uk_UA vi_VN tl_PH ar_EG fa_IR th_TH sw_TZ ms_MY af_ZA zu_ZA am_ET en_XA ar_XB fr_CA km_KH lo_LA ne_NP si_LK mn_MN hy_AM az_AZ ka_GE

PRODUCT_LOCALES := en_US en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ pl_PL ja_JP zh_TW zh_CN zh_HK ru_RU ko_KR nb_NO es_US da_DK el_GR tr_TR pt_PT pt_BR rm_CH sv_SE bg_BG ca_ES en_GB fi_FI hi_IN hr_HR hu_HU in_ID iw_IL lt_LT lv_LV ro_RO sk_SK sl_SI sr_RS uk_UA vi_VN tl_PH ar_EG fa_IR th_TH sw_TZ ms_MY af_ZA zu_ZA am_ET en_XA ar_XB fr_CA km_KH lo_LA ne_NP mn_MN hy_AM az_AZ ka_GE



# CyanogenMod

PRODUCT_LOCALES += ml_IN ku_IQ pa_IN es_XA ug_CN ta_IN
 
PRODUCT_LOCALES += ml_IN ku_IQ es_XA ug_CN ta_IN lb_LU

target/product/locales_full.mk

+1 −1
Original line number Diff line number Diff line 
PRODUCT_LOCALES := en_US cs_CZ da_DK de_AT de_CH de_DE de_LI el_GR en_AU en_CA en_GB en_NZ en_SG eo_EU es_ES fr_CA fr_CH fr_BE fr_FR it_CH it_IT ja_JP ko_KR nb_NO nl_BE nl_NL pl_PL pt_PT ru_RU sv_SE tr_TR zh_CN zh_HK zh_TW am_ET hi_IN



# CyanogenMod

PRODUCT_LOCALES += ml_IN ku_IQ pa_IN es_XA ug_CN ta_IN

PRODUCT_LOCALES += ml_IN ku_IQ es_XA ug_CN ta_IN lb_LU



$(call inherit-product, build/target/product/languages_full.mk)

tools/releasetools/common.py

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, 
  prebuilt_path = os.path.join(prebuilt_dir, prebuilt_name)

  custom_bootimg_mk = os.getenv('MKBOOTIMG')

  if custom_bootimg_mk:

    bootimage_path = os.path.join(os.getenv('OUT'), "boot.img")

    bootimage_path = os.path.join(os.getenv('OUT'), prebuilt_name)

    print "using custom bootimage makefile %s..." % (custom_bootimg_mk,)

    if not os.path.isdir(prebuilt_dir):

        os.mkdir(prebuilt_dir)

tools/releasetools/img_from_target_files

+25 −0
Original line number Diff line number Diff line
@@ -201,6 +201,30 @@ def CopyInfo(output_zip): 
  output_zip.write(os.path.join(OPTIONS.input_tmp, "OTA", "android-info.txt"),

                   "android-info.txt")



def AddRadio(output_zip):

  """If they exist, add RADIO files to the output."""

  if os.path.isdir(os.path.join(OPTIONS.input_tmp, "RADIO")):

    for radio_root, radio_dirs, radio_files in os.walk(os.path.join(OPTIONS.input_tmp, "RADIO")):

      for radio_file in radio_files:

        output_zip.write(os.path.join(radio_root, radio_file), radio_file)



    # If a filesmap file exists, create a script to flash the radio images based on it

    filesmap = os.path.join(OPTIONS.input_tmp, "RADIO/filesmap")

    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+)$')

      tmp_flash_radio = tempfile.NamedTemporaryFile()

      for filesmap_line in filesmap_data:

        filesmap_entry = filesmap_regex.search(filesmap_line)

        if filesmap_entry:

          tmp_flash_radio.write("fastboot flash %s %s" % (filesmap_entry.group(2), filesmap_entry.group(1)))

      tmp_flash_radio.flush()

      if os.path.getsize(tmp_flash_radio.name) > 0:

        output_zip.write(tmp_flash_radio.name, "flash-radio.sh")

      else:

        print "flash-radio.sh is empty, skipping..."

      tmp_flash_radio.close()



def main(argv):

  bootable_only = [False]
@@ -251,6 +275,7 @@ def main(argv): 
    AddUserdata(output_zip)

    AddCache(output_zip)

    CopyInfo(output_zip)

    AddRadio(output_zip)



  print "cleaning up..."

  output_zip.close()