StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Retire emulator.mk" am: 7af526f93f am: a005fa4e87 am: 0ee4c4cfa9 am: b9dc536e17 am: 1190099822

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2241353

Change-Id: Ibd2050f8143b3ffc0e6daf17a37804ce3fb0ff8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-10-04 22:20:18 +00:00
committed by Automerger Merge Worker
parent 100c70bd7f 1190099822
commit 1a56449563
3 changed files with 2 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
target/product/emulator.mk
View File

@@ -1,60 +0,0 @@
#
# Copyright (C) 2012 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 is included by other product makefiles to add all the
# emulator-related modules to PRODUCT_PACKAGES.
#
# Device modules
PRODUCT_PACKAGES += \
CarrierConfig \
# need this for gles libraries to load properly
# after moving to /vendor/lib/
PRODUCT_PACKAGES += \
vndk-sp
# WiFi: system side
PRODUCT_PACKAGES += \
ip \
iw \
wificond \
PRODUCT_PACKAGE_OVERLAYS := device/generic/goldfish/overlay
PRODUCT_CHARACTERISTICS := emulator
PRODUCT_FULL_TREBLE_OVERRIDE := true
# goldfish vendor partition configurations
$(call inherit-product-if-exists, device/generic/goldfish/vendor.mk)
#watchdog tiggers reboot because location service is not
#responding, disble it for now.
#still keep it on internal master as it is still working
#once it is fixed in aosp, remove this block of comment.
#PRODUCT_VENDOR_PROPERTIES += \
#config.disable_location=true
# enable Google-specific location features,
# like NetworkLocationProvider and LocationCollector
PRODUCT_SYSTEM_EXT_PROPERTIES += \
ro.com.google.locationfeatures=1
# disable setupwizard
PRODUCT_SYSTEM_EXT_PROPERTIES += \
ro.setupwizard.mode=DISABLED

2
target/product/full.mk
View File

@@ -20,7 +20,7 @@
# entirely appropriate to inherit from for on-device configurations. # entirely appropriate to inherit from for on-device configurations.
$(call inherit-product-if-exists, device/generic/goldfish/arm32-vendor.mk) $(call inherit-product-if-exists, device/generic/goldfish/arm32-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)

2
target/product/full_x86.mk
View File

@@ -23,7 +23,7 @@
# that isn't a wifi connection. This will instruct init.rc to enable the # that isn't a wifi connection. This will instruct init.rc to enable the
# network connection so that you can use it with ADB # network connection so that you can use it with ADB
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)