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

Commit 04073ad3 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

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

Conflicts:
	tools/releasetools/common.py

Change-Id: Ic92509329754f9ee6d7d30b552e58e34c1ac8003
parents ddfb6cc7 078a5cdb

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



export BUILD_ID=KOT49H
 
export BUILD_ID=KVT49L

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ endif 


# Keep a copy of the jar just before proguard processing.

$(full_classes_jar): $(full_classes_emma_jar) | $(ACP)

	@echo -e ${CL_GRN}"Copying:"${CL_GRN}" $@"

	@echo -e ${CL_GRN}"Copying:"${CL_RST}" $@"

	$(hide) $(ACP) -fp $< $@



# Run proguard if necessary, otherwise just copy the file.

target/product/core_base.mk

+3 −2
Original line number Diff line number Diff line
@@ -63,8 +63,9 @@ PRODUCT_PACKAGES += \ 
    requestsync \

    screenrecord \

    telephony-common \

    voip-common

    voip-common \

    telephony-msim



$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)

# Override the PRODUCT_BOOT_JARS set in core_minimal.mk

PRODUCT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium
 
PRODUCT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium:telephony-msim

target/product/generic_no_telephony.mk

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ PRODUCT_PACKAGES := \ 
    OneTimeInitializer \

    PrintSpooler \

    Provision \

    QuickSearchBox \

    Settings \

    SystemUI \

    TeleService \

target/product/languages_full.mk

+4 −1
Original line number Diff line number Diff line
@@ -21,4 +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 hi_IN en_XA ar_XB fr_CA km_KH lo_LA ne_NP si_LK mn_MN hy_AM az_AZ ka_GE ml_IN ku_IQ pa_IN es_XA
 
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



# CyanogenMod

PRODUCT_LOCALES += ml_IN ku_IQ pa_IN es_XA ug_CN ta_IN