tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master

Browse source
This commit is contained in:
TreeHugger Robot 2020-01-16 18:29:25 +00:00 committed by Android (Google) Code Review
commit 2f0743483b
8 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OWNERS
View file

@ -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

3
core/main.mk
View file

@ -220,9 +220,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:
#

2
core/version_defaults.mk
View file

@ -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-01-01
PLATFORM_SECURITY_PATCH := 2020-03-01
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH

24
target/product/emulator_system.mk Normal file
View file

@ -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

3
target/product/mainline_arm64.mk
View file

@ -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

3
target/product/mainline_system_arm64.mk
View file

@ -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

3
target/product/mainline_system_x86.mk
View file

@ -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

3
target/product/mainline_system_x86_arm.mk
View file

@ -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