diff options
| -rw-r--r-- | OWNERS | 2 | ||||
| -rw-r--r-- | core/main.mk | 3 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | target/product/emulator_system.mk | 24 | ||||
| -rw-r--r-- | target/product/mainline_arm64.mk | 3 | ||||
| -rw-r--r-- | target/product/mainline_system_arm64.mk | 3 | ||||
| -rw-r--r-- | target/product/mainline_system_x86.mk | 3 | ||||
| -rw-r--r-- | target/product/mainline_system_x86_arm.mk | 3 |
8 files changed, 34 insertions, 9 deletions
@@ -8,4 +8,4 @@ jungjw@google.com hansson@google.com # For version updates -per-file version_defaults.mk = aseaton@google.com,elisapascual@google.com +per-file version_defaults.mk = aseaton@google.com,elisapascual@google.com,lubomir@google.com,pscovanner@google.com diff --git a/core/main.mk b/core/main.mk index dc8080ddad..ed18156496 100644 --- a/core/main.mk +++ b/core/main.mk @@ -222,9 +222,6 @@ ifneq ($(TARGET_BUILD_VARIANT),user) ADDITIONAL_BUILD_PROPERTIES += persist.debug.dalvik.vm.core_platform_api_policy=just-warn endif -# Define ro.sanitize.<name> properties for all global sanitizers. -ADDITIONAL_BUILD_PROPERTIES += $(foreach s,$(SANITIZE_TARGET),ro.sanitize.$(s)=true) - # Sets the default value of ro.postinstall.fstab.prefix to /system. # Device board config should override the value to /product when needed by: # diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 57268ce3dc..ab7783ff94 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,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-02-05 + PLATFORM_SECURITY_PATCH := 2020-03-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH diff --git a/target/product/emulator_system.mk b/target/product/emulator_system.mk new file mode 100644 index 0000000000..4b6987cd9b --- /dev/null +++ b/target/product/emulator_system.mk @@ -0,0 +1,24 @@ +# +# Copyright (C) 2019 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# This file lists emulator experimental modules added to PRODUCT_PACKAGES, +# only included by targets sdk_phone_x86/64 and sdk_gphone_x86/64 + +PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST := \ + system/lib/libemulator_multidisplay_jni.so \ + system/lib64/libemulator_multidisplay_jni.so \ + system/priv-app/MultiDisplayProvider/MultiDisplayProvider.apk \ + +PRODUCT_PACKAGES += MultiDisplayProvider diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk index 52b3222958..850c7754a5 100644 --- a/target/product/mainline_arm64.mk +++ b/target/product/mainline_arm64.mk @@ -29,7 +29,8 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ PRODUCT_SHIPPING_API_LEVEL := 29 -PRODUCT_RESTRICT_VENDOR_FILES := all +# TODO(b/137033385): change this back to "all" +PRODUCT_RESTRICT_VENDOR_FILES := owner PRODUCT_NAME := mainline_arm64 PRODUCT_DEVICE := mainline_arm64 diff --git a/target/product/mainline_system_arm64.mk b/target/product/mainline_system_arm64.mk index 772c687c1b..60035c13ea 100644 --- a/target/product/mainline_system_arm64.mk +++ b/target/product/mainline_system_arm64.mk @@ -36,7 +36,8 @@ PRODUCT_BUILD_VENDOR_IMAGE := false PRODUCT_SHIPPING_API_LEVEL := 29 -PRODUCT_RESTRICT_VENDOR_FILES := all +# TODO(b/137033385): change this back to "all" +PRODUCT_RESTRICT_VENDOR_FILES := owner PRODUCT_NAME := mainline_system_arm64 PRODUCT_DEVICE := mainline_arm64 diff --git a/target/product/mainline_system_x86.mk b/target/product/mainline_system_x86.mk index 05e51a9c01..a30a1fcb4f 100644 --- a/target/product/mainline_system_x86.mk +++ b/target/product/mainline_system_x86.mk @@ -35,7 +35,8 @@ PRODUCT_BUILD_VENDOR_IMAGE := false PRODUCT_SHIPPING_API_LEVEL := 29 -PRODUCT_RESTRICT_VENDOR_FILES := all +# TODO(b/137033385): change this back to "all" +PRODUCT_RESTRICT_VENDOR_FILES := owner PRODUCT_NAME := mainline_system_x86 PRODUCT_DEVICE := mainline_x86 diff --git a/target/product/mainline_system_x86_arm.mk b/target/product/mainline_system_x86_arm.mk index cc11c55f2f..2e01cde768 100644 --- a/target/product/mainline_system_x86_arm.mk +++ b/target/product/mainline_system_x86_arm.mk @@ -35,7 +35,8 @@ PRODUCT_BUILD_VENDOR_IMAGE := false PRODUCT_SHIPPING_API_LEVEL := 29 -PRODUCT_RESTRICT_VENDOR_FILES := all +# TODO(b/137033385): change this back to "all" +PRODUCT_RESTRICT_VENDOR_FILES := owner PRODUCT_NAME := mainline_system_x86_arm PRODUCT_DEVICE := mainline_x86_arm |