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

Commit ffb41e81 authored by Bill Yi's avatar Bill Yi Committed by Gerrit Code Review
Browse files

Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE"

parents 28a7820b a78308d9

OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -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

core/main.mk

+0 −3
Original line number Diff line number Diff line
@@ -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:

#

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/product/emulator_system.mk

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#

# 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

target/product/mainline_arm64.mk

+2 −1
Original line number Diff line number Diff line
@@ -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