diff options
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | target/product/cfi-common.mk | 1 | ||||
| -rw-r--r-- | target/product/generic_system.mk | 3 | ||||
| -rw-r--r-- | target/product/generic_system_arm64.mk | 3 | ||||
| -rw-r--r-- | target/product/generic_system_x86.mk | 3 | ||||
| -rw-r--r-- | target/product/generic_system_x86_64.mk | 2 | ||||
| -rw-r--r-- | target/product/generic_system_x86_arm.mk | 3 | ||||
| -rw-r--r-- | target/product/media_system.mk | 1 |
9 files changed, 2 insertions, 18 deletions
diff --git a/core/Makefile b/core/Makefile index 6f9254fcc6..e6bc69d10b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 # ----------------------------------------------------------------- diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 73622753a5..22eb1e1d70 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -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 diff --git a/target/product/cfi-common.mk b/target/product/cfi-common.mk index 623a9a87b4..82f53f681b 100644 --- a/target/product/cfi-common.mk +++ b/target/product/cfi-common.mk @@ -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 \ diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk index 731a450292..9580ade6f8 100644 --- a/target/product/generic_system.mk +++ b/target/product/generic_system.mk @@ -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 diff --git a/target/product/generic_system_arm64.mk b/target/product/generic_system_arm64.mk index b8b12c3214..2c64479f17 100644 --- a/target/product/generic_system_arm64.mk +++ b/target/product/generic_system_arm64.mk @@ -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 diff --git a/target/product/generic_system_x86.mk b/target/product/generic_system_x86.mk index dddcb7e2ed..cf38a9876c 100644 --- a/target/product/generic_system_x86.mk +++ b/target/product/generic_system_x86.mk @@ -37,9 +37,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_x86 PRODUCT_DEVICE := mainline_x86 PRODUCT_BRAND := generic diff --git a/target/product/generic_system_x86_64.mk b/target/product/generic_system_x86_64.mk index 1ca967835a..5f3829bbb4 100644 --- a/target/product/generic_system_x86_64.mk +++ b/target/product/generic_system_x86_64.mk @@ -38,8 +38,6 @@ PRODUCT_BUILD_VENDOR_IMAGE := false PRODUCT_SHIPPING_API_LEVEL := 29 -PRODUCT_RESTRICT_VENDOR_FILES := all - PRODUCT_NAME := generic_system_x86_64 PRODUCT_DEVICE := mainline_x86_64 PRODUCT_BRAND := generic diff --git a/target/product/generic_system_x86_arm.mk b/target/product/generic_system_x86_arm.mk index a62fb9b8ad..923f32dcbd 100644 --- a/target/product/generic_system_x86_arm.mk +++ b/target/product/generic_system_x86_arm.mk @@ -37,9 +37,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_x86_arm PRODUCT_DEVICE := mainline_x86_arm PRODUCT_BRAND := generic diff --git a/target/product/media_system.mk b/target/product/media_system.mk index 1004dc57f3..4ebec519e4 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -58,7 +58,6 @@ PRODUCT_SYSTEM_SERVER_JARS := \ # The values should be of the format <apex name>:<jar name> PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ com.android.permission:service-permission \ - com.android.wifi:service-wifi \ com.android.ipsec:android.net.ipsec.ike \ PRODUCT_COPY_FILES += \ |