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

Commit 771feadf authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/build into cm-13.0 

Android 6.0.1 release 22

Change-Id: Icd3603c1efc5fa85f48c19d13d484f0371ddae37
parents ad12b369 57d06af7

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=MMB29V
 
export BUILD_ID=MHC19J

core/product_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ ifdef product_goals 
  # which really means TARGET_PRODUCT=dream make installclean.

  ifneq ($(filter-out $(INTERNAL_VALID_VARIANTS),$(TARGET_BUILD_VARIANT)),)

    MAKECMDGOALS := $(MAKECMDGOALS) $(TARGET_BUILD_VARIANT)

    TARGET_BUILD_VARIANT := eng

    TARGET_BUILD_VARIANT := userdebug

    default_goal_substitution :=

  else

    default_goal_substitution := $(DEFAULT_GOAL)

target/board/generic/sepolicy/property_contexts

+2 −0
Original line number Diff line number Diff line 
qemu.                   u:object_r:qemu_prop:s0

emu.                    u:object_r:qemu_prop:s0

emulator.               u:object_r:qemu_prop:s0

radio.noril             u:object_r:radio_noril_prop:s0

target/product/core.mk

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \ 
    DownloadProviderUi \

    Email \

    ExactCalculator \

    Exchange2 \

    ExternalStorageProvider \

    FusedLocation \

    InputDevices \

target/product/core_tiny.mk

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ PRODUCT_PACKAGES += \ 
    javax.btobex \

    keystore \

    keystore.default \

    ld.mc \

    libOpenMAXAL \

    libOpenSLES \

    libdownmix \