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

Commit d9bbd880 authored by Roman Kiryanov's avatar Roman Kiryanov
Browse files

Retire emulator.mk 



use emulator_vendor.mk instead

Bug: 250696437
Test: presubmit
Signed-off-by: default avatarRoman Kiryanov <rkir@google.com>
Change-Id: Ib770efb32fdf014d8ffa20ec34485d3235036a4a
parent 1bcc569e

target/product/emulator.mk

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
#

# 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

target/product/full.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
# entirely appropriate to inherit from for on-device configurations.



$(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)/board/generic/device.mk)

target/product/full_x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
# that isn't a wifi connection. This will instruct init.rc to enable the

# 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)/board/generic_x86/device.mk)