Merge "DO NOT MERGE Revert "Revert "Delete unused mk files"""
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index d28d34e..ad736c4 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -23,7 +23,6 @@
aosp_cf_x86_phone_noapex:$(LOCAL_DIR)/vsoc_x86_noapex/aosp_cf_noapex.mk \
aosp_cf_x86_go_phone:$(LOCAL_DIR)/vsoc_x86/go_phone/device.mk \
aosp_cf_x86_go_512_phone:$(LOCAL_DIR)/vsoc_x86/go_512_phone/device.mk \
- aosp_cf_x86_gsi:$(LOCAL_DIR)/vsoc_x86/gsi/aosp_cf_x86_gsi.mk \
aosp_cf_x86_tv:$(LOCAL_DIR)/vsoc_x86/tv/device.mk
COMMON_LUNCH_CHOICES := \
diff --git a/shared/gsi/device.mk b/shared/gsi/device.mk
deleted file mode 100644
index 4efd383..0000000
--- a/shared/gsi/device.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2018 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.
-#
-
-DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
-$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
-
-# use include below so PRODUCT_SHIPPING_API_LEVEL can be overriden
-include device/google/cuttlefish/shared/device.mk
-PRODUCT_SHIPPING_API_LEVEL := 28
-
-TARGET_BUILD_SYSTEM_ROOT_IMAGE ?= true
-
-PRODUCT_CHARACTERISTICS := nosdcard
-
-PRODUCT_PROPERTY_OVERRIDES += \
- keyguard.no_require_sim=true \
- ro.cdma.home.operator.alpha=Android \
- ro.cdma.home.operator.numeric=302780 \
- vendor.rild.libpath=libcuttlefish-ril.so \
- ro.lmk.kill_heaviest_task=true \
- ro.lmk.kill_timeout_ms=100 \
- ro.lmk.use_minfree_levels=true \
-
-PRODUCT_PACKAGES += \
- MmsService \
- Phone \
- PhoneService \
- Telecom \
- TeleService \
- libcuttlefish-ril \
- rild \
-
-PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml
-
-# libGLES_android, SdkSetup, and vintf are in current AOSP GSI
-# SdkSetup may need to be removed when it's moved to emulator vendor.
-PRODUCT_PACKAGES += \
- libGLES_android \
- SdkSetup \
- vintf
-
-# Needed for /system/priv-app/SdkSetup/SdkSetup.apk to pass CTS android.permission2.cts.PrivappPermissionsTest.
-PRODUCT_COPY_FILES += \
- device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-goldfish.xml
-
-# NFC:
-# Provide default libnfc-nci.conf file for devices that does not have one in
-# vendor/etc because aosp system image (of aosp_$arch products) is going to
-# be used as GSI.
-# May need to remove the following for newly launched devices in P since this
-# NFC configuration file should be in vendor/etc, instead of system/etc
-PRODUCT_COPY_FILES += \
- device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf
-
-# These flags are important for the GSI, but break auto
-PRODUCT_ENFORCE_RRO_TARGETS := framework-res
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := device/google/cuttlefish/shared/overlay
diff --git a/shared/gsi/wpa_supplicant_overlay.conf b/shared/gsi/wpa_supplicant_overlay.conf
deleted file mode 100644
index e1f530d..0000000
--- a/shared/gsi/wpa_supplicant_overlay.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-disable_scan_offload=1
-p2p_disabled=1
-tdls_external_control=1
diff --git a/shared/wear/device.mk b/shared/wear/device.mk
deleted file mode 100644
index bc30379..0000000
--- a/shared/wear/device.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-DEVICE_MANIFEST_FILE += device/google/cuttlefish/shared/config/manifest.xml
-
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
-$(call inherit-product, device/google/cuttlefish/shared/device.mk)
-
diff --git a/vsoc_x86/gsi/aosp_cf_x86_gsi.mk b/vsoc_x86/gsi/aosp_cf_x86_gsi.mk
deleted file mode 100644
index 64ee7a4..0000000
--- a/vsoc_x86/gsi/aosp_cf_x86_gsi.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2018 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.
-#
-
-$(call inherit-product, device/google/cuttlefish/shared/gsi/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_gsi
-PRODUCT_DEVICE := vsoc_x86
-PRODUCT_MODEL := Cuttlefish x86 GSI
-
-# Enable A/B update
-AB_OTA_UPDATER := true
-AB_OTA_PARTITIONS := system
-PRODUCT_PACKAGES += \
- update_engine \
- update_verifier
-
-# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI
-#PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
-
-# Support addtional P vendor interface
-PRODUCT_EXTRA_VNDK_VERSIONS := 28
-
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86/phone/overlay
diff --git a/vsoc_x86/pasan/device.mk b/vsoc_x86/pasan/device.mk
deleted file mode 100644
index a0dad87..0000000
--- a/vsoc_x86/pasan/device.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-$(call inherit-product, device/google/cuttlefish/shared/phone/device.mk)
-$(call inherit-product, device/google/cuttlefish/vsoc_x86/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_pasan
-PRODUCT_DEVICE := vsoc_x86
-PRODUCT_MODEL := Cuttlefish x86 phone
-# Intentionally points to phone overlay to avoid code duplication
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86/phone/overlay
