Merge "Revert "[MultiDisplay] remove emulator_system.mk""

#

# 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