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

Commit 2bbb6c9e authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge Android R QPR1"

parents 74e57f64 ca9a71ef

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5106,7 +5106,7 @@ ifeq (true,$(CLANG_COVERAGE)) 
  $(PROFDATA_ZIP): $(SOONG_ZIP)

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) -f $(LLVM_PROFDATA) -f $(LIBCXX)



  $(call dist-for-goals,droidcore apps_only,$(PROFDATA_ZIP))

  $(call dist-for-goals,droidcore,$(PROFDATA_ZIP))

endif



# -----------------------------------------------------------------

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH 
    #  It must be of the form "YYYY-MM-DD" on production devices.

    #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.

    #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.

      PLATFORM_SECURITY_PATCH := 2020-11-05

      PLATFORM_SECURITY_PATCH := 2020-12-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH

target/product/cfi-common.mk

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
PRODUCT_CFI_INCLUDE_PATHS :=  \

    device/generic/goldfish/wifi/wpa_supplicant_8_lib \

    device/google/cuttlefish/guest/libs/wpa_supplicant_8_lib \

    device/google/wahoo/wifi_offload \

    external/tinyxml2 \

    external/wpa_supplicant_8 \

    frameworks/av/camera \

target/product/generic_system.mk

+0 −3
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true 


PRODUCT_ENFORCE_RRO_TARGETS := *



# TODO(b/150820813) Settings depends on static overlay, remove this after eliminating the dependency.

PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS := Settings



PRODUCT_NAME := generic_system

PRODUCT_BRAND := generic

target/product/generic_system_arm64.mk

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ PRODUCT_BUILD_VENDOR_IMAGE := false 


PRODUCT_SHIPPING_API_LEVEL := 29



# TODO(b/137033385): change this back to "all"

PRODUCT_RESTRICT_VENDOR_FILES := owner



PRODUCT_NAME := generic_system_arm64

PRODUCT_DEVICE := mainline_arm64

PRODUCT_BRAND := generic