diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-13 20:00:11 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-13 20:00:11 +0000 |
commit | 0af0f194faede21a006a0af6d2939f10820fedda (patch) | |
tree | f017b9016b5b0238ea9c9cb97526343c65604309 | |
parent | caa971167d1ba391cf7ba8ea124ff74da74f878f (diff) | |
parent | 436b42a079e82f4cdd69a8abe5ac2ab798bd825a (diff) | |
download | build-android10-mainline-media-release.tar.gz |
Snap for 6131310 from 436b42a079e82f4cdd69a8abe5ac2ab798bd825a to qt-aml-media-releaseandroid-mainline-10.0.0_r10android10-mainline-media-release
Change-Id: Ia04c201abeec61ba78af813130409bebab3a36dc
-rw-r--r-- | core/version_defaults.mk | 2 | ||||
-rw-r--r-- | target/product/developer_gsi_keys.mk | 29 | ||||
-rw-r--r-- | target/product/emulator_system.mk | 24 |
3 files changed, 54 insertions, 1 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 6e72f2c37c..98d777d373 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-01 + PLATFORM_SECURITY_PATCH := 2020-03-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH diff --git a/target/product/developer_gsi_keys.mk b/target/product/developer_gsi_keys.mk new file mode 100644 index 0000000000..79451ad912 --- /dev/null +++ b/target/product/developer_gsi_keys.mk @@ -0,0 +1,29 @@ +# +# 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. +# + +# Device makers who are willing to support booting the public Developer-GSI +# in locked state can add the following line into a device.mk to inherit this +# makefile. This file will then install the up-to-date GSI public keys into +# the first-stage ramdisk to pass verified boot. +# +# In device/<company>/<board>/device.mk: +# $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk) +# +# Currently, the developer GSI images can be downloaded from the following URL: +# https://developer.android.com/topic/generic-system-image/releases +# +PRODUCT_PACKAGES += \ + q-developer-gsi.avbpubkey \ 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 |