Reduce cuttlefish targets
Bug: 130846989
Bug: 130887841
Change-Id: Id4ffc88fac0e0d240f57ae517be088d6429170df
Merged-In: Id4ffc88fac0e0d240f57ae517be088d6429170df
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 2a6e400..cc43a54 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,41 +15,16 @@
#
PRODUCT_MAKEFILES := \
- aosp_cf_arm_phone:$(LOCAL_DIR)/vsoc_arm/phone/device.mk \
aosp_cf_arm64_phone:$(LOCAL_DIR)/vsoc_arm64/phone/device.mk \
- aosp_cf_x86_64_auto:$(LOCAL_DIR)/vsoc_x86_64/auto/device.mk \
- aosp_cf_x86_64_pasan:$(LOCAL_DIR)/vsoc_x86_64/pasan/device.mk \
- aosp_cf_x86_64_phone:$(LOCAL_DIR)/vsoc_x86_64/phone/device.mk \
- aosp_cf_x86_64_go_phone:$(LOCAL_DIR)/vsoc_x86_64/go_phone/device.mk \
- aosp_cf_x86_64_go_512_phone:$(LOCAL_DIR)/vsoc_x86_64/go_512_phone/device.mk \
- aosp_cf_x86_64_gsi:$(LOCAL_DIR)/vsoc_x86_64/gsi/aosp_cf_x86_64_gsi.mk \
- aosp_cf_x86_64_tablet:$(LOCAL_DIR)/vsoc_x86_64/tablet/device.mk \
- aosp_cf_x86_64_tablet_3g:$(LOCAL_DIR)/vsoc_x86_64/tablet_3g/device.mk \
- aosp_cf_x86_64_tv:$(LOCAL_DIR)/vsoc_x86_64/tv/device.mk \
- aosp_cf_x86_64_wear:$(LOCAL_DIR)/vsoc_x86_64/wear/device.mk \
aosp_cf_x86_auto:$(LOCAL_DIR)/vsoc_x86/auto/device.mk \
aosp_cf_x86_pasan:$(LOCAL_DIR)/vsoc_x86/pasan/device.mk \
aosp_cf_x86_phone:$(LOCAL_DIR)/vsoc_x86/phone/device.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_tablet:$(LOCAL_DIR)/vsoc_x86/tablet/device.mk \
- aosp_cf_x86_tablet_3g:$(LOCAL_DIR)/vsoc_x86/tablet_3g/device.mk \
- aosp_cf_x86_tv:$(LOCAL_DIR)/vsoc_x86/tv/device.mk \
- aosp_cf_x86_wear:$(LOCAL_DIR)/vsoc_x86/wear/device.mk \
+ aosp_cf_x86_tv:$(LOCAL_DIR)/vsoc_x86/tv/device.mk
COMMON_LUNCH_CHOICES := \
- aosp_cf_arm_phone-userdebug \
aosp_cf_arm64_phone-userdebug \
aosp_cf_x86_auto-userdebug \
aosp_cf_x86_phone-userdebug \
- aosp_cf_x86_tablet-userdebug \
- aosp_cf_x86_tablet_3g-userdebug \
- aosp_cf_x86_tv-userdebug \
- aosp_cf_x86_wear-userdebug \
- aosp_cf_x86_64_auto-userdebug \
- aosp_cf_x86_64_phone-userdebug \
- aosp_cf_x86_64_tablet-userdebug \
- aosp_cf_x86_64_tablet_3g-userdebug \
- aosp_cf_x86_64_tv-userdebug \
- aosp_cf_x86_64_wear-userdebug
+ aosp_cf_x86_tv-userdebug
diff --git a/vsoc_arm/BoardConfig.mk b/vsoc_arm/BoardConfig.mk
deleted file mode 100644
index e203bf5..0000000
--- a/vsoc_arm/BoardConfig.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 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.
-#
-
-#
-# x86 target for Cuttlefish
-#
-
--include device/google/cuttlefish/shared/BoardConfig.mk
-
-TARGET_BOARD_PLATFORM := vsoc_arm
-TARGET_ARCH := arm
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_VARIANT := cortex-a53
-
-BUILD_BROKEN_DUP_RULES := true
diff --git a/vsoc_arm/phone/device.mk b/vsoc_arm/phone/device.mk
deleted file mode 100644
index 6701e57..0000000
--- a/vsoc_arm/phone/device.mk
+++ /dev/null
@@ -1,22 +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)
-
-PRODUCT_NAME := aosp_cf_arm_phone
-PRODUCT_DEVICE := vsoc_arm
-PRODUCT_MODEL := Cuttlefish arm phone
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_arm/phone/overlay
diff --git a/vsoc_arm/phone/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_arm/phone/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 2b7dfbe..0000000
--- a/vsoc_arm/phone/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="networkAttributes" translatable="false">
- <item>"mobile,0,0,0,-1,true"</item>
- <item>"wifi,1,1,1,-1,true"</item>
- <item>"mobile_mms,2,0,2,60000,true"</item>
- <item>"mobile_hipri,5,0,3,60000,true"</item>
- <item>"bluetooth,7,7,2,-1,true"</item>
- </string-array>
- <string-array name="radioAttributes" translatable="false">
- <item>"0,1"</item>
- <item>"1,1"</item>
- <item>"4,1"</item>
- <item>"7,1"</item>
- <item>"11,1"</item>
- </string-array>
- <string-array name="config_tether_wifi_regexs" translatable="false">
- <item>"wlan0"</item>
- </string-array>
- <string-array name="config_tether_apndata" translatable="false">
- <item>Android,android,,,,,,,,310,260,,default,dun,ims</item>
- </string-array>
- <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
- <bool name="config_bluetooth_address_validation">true</bool>
- <bool name="config_sms_capable">true</bool>
- <string name="default_sms_application" translatable="false">com.android.mms</string>
- <bool name="config_showNavigationBar">true</bool>
- <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
- <integer name="config_mobile_mtu">1460</integer>
- <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
- Network Offload feature. We disable the use of this feature here. -->
- <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
- <!-- Maximum number of supported users -->
- <integer name="config_multiuserMaximumUsers">4</integer>
-</resources>
diff --git a/vsoc_x86/go_512_phone/device.mk b/vsoc_x86/go_512_phone/device.mk
deleted file mode 100644
index b33d06e..0000000
--- a/vsoc_x86/go_512_phone/device.mk
+++ /dev/null
@@ -1,23 +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/go_512/device.mk)
-$(call inherit-product, device/google/cuttlefish/vsoc_x86/phone/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_go_512_phone
-PRODUCT_DEVICE := vsoc_x86
-PRODUCT_MODEL := Cuttlefish x86 Go 512 phone
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86/phone/overlay
diff --git a/vsoc_x86/tablet/device.mk b/vsoc_x86/tablet/device.mk
deleted file mode 100644
index 5d39f48..0000000
--- a/vsoc_x86/tablet/device.mk
+++ /dev/null
@@ -1,22 +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/tablet/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_tablet
-PRODUCT_DEVICE := vsoc_x86
-PRODUCT_MODEL := Cuttlefish x86 tablet
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86/tablet/overlay
diff --git a/vsoc_x86/tablet/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86/tablet/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 5b29ae6..0000000
--- a/vsoc_x86/tablet/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="networkAttributes" translatable="false">
- <item>"wifi,1,1,1,-1,true"</item>
- <item>"bluetooth,7,7,2,-1,true"</item>
- </string-array>
- <string-array name="radioAttributes" translatable="false">
- <item>"1,1"</item>
- <item>"7,1"</item>
- </string-array>
- <string-array name="config_tether_wifi_regexs" translatable="false">
- <item>"wlan0"</item>
- </string-array>
- <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
- <bool name="config_bluetooth_address_validation">true</bool>
- <bool name="config_voice_capable">false</bool>
- <bool name="config_sms_capable">false</bool>
- <string name="default_sms_application" translatable="false">com.android.mms</string>
- <bool name="config_showNavigationBar">true</bool>
- <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
-
- <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
- Network Offload feature. We disable the use of this feature here. -->
- <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
-
- <!-- Maximum number of supported users -->
- <integer name="config_multiuserMaximumUsers">8</integer>
-</resources>
diff --git a/vsoc_x86/tablet_3g/device.mk b/vsoc_x86/tablet_3g/device.mk
deleted file mode 100644
index 08150a5..0000000
--- a/vsoc_x86/tablet_3g/device.mk
+++ /dev/null
@@ -1,22 +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/tablet_3g/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_tablet_3g
-PRODUCT_DEVICE := vsoc_x86
-PRODUCT_MODEL := Cuttlefish x86 tablet mobile
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86/tablet_3g/overlay
diff --git a/vsoc_x86/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 2e94ba8..0000000
--- a/vsoc_x86/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="networkAttributes" translatable="false">
- <item>"mobile,0,0,0,-1,true"</item>
- <item>"wifi,1,1,1,-1,true"</item>
- <item>"mobile_mms,2,0,2,60000,true"</item>
- <item>"mobile_hipri,5,0,3,60000,true"</item>
- <item>"bluetooth,7,7,2,-1,true"</item>
- </string-array>
- <string-array name="radioAttributes" translatable="false">
- <item>"0,1"</item>
- <item>"1,1"</item>
- <item>"4,1"</item>
- <item>"7,1"</item>
- <item>"11,1"</item>
- </string-array>
- <string-array name="config_tether_wifi_regexs" translatable="false">
- <item>"wlan0"</item>
- </string-array>
- <string-array name="config_tether_apndata" translatable="false">
- <item>Android,android,,,,,,,,302,780,,default,dun,ims</item>
- </string-array>
- <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
- <bool name="config_bluetooth_address_validation">true</bool>
- <bool name="config_sms_capable">false</bool>
- <string name="default_sms_application" translatable="false">com.android.mms</string>
- <bool name="config_showNavigationBar">true</bool>
- <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
- <integer name="config_mobile_mtu">1460</integer>
- <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
- Network Offload feature. We disable the use of this feature here. -->
- <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
- <!-- Maximum number of supported users -->
- <integer name="config_multiuserMaximumUsers">8</integer>
-</resources>
diff --git a/vsoc_x86/wear/device.mk b/vsoc_x86/wear/device.mk
deleted file mode 100644
index fe3ae47..0000000
--- a/vsoc_x86/wear/device.mk
+++ /dev/null
@@ -1,22 +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/wear/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_wear
-PRODUCT_DEVICE := vsoc_x86
-PRODUCT_MODEL := Cuttlefish x86 wear
-# PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86/wear/overlay
diff --git a/vsoc_x86_64/BoardConfig.mk b/vsoc_x86_64/BoardConfig.mk
deleted file mode 100644
index 8c2fa675..0000000
--- a/vsoc_x86_64/BoardConfig.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright 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.
-#
-
-#
-# x86_64 target for Cuttlefish
-#
-
--include device/google/cuttlefish/shared/BoardConfig.mk
-
-TARGET_BOARD_PLATFORM := vsoc_x86_64
-TARGET_ARCH := x86_64
-TARGET_ARCH_VARIANT := silvermont
-TARGET_CPU_ABI := x86_64
-TARGET_CPU_ABI_LIST_32_BIT := x86
-TARGET_2ND_ARCH := x86
-TARGET_2ND_CPU_ABI := x86
-TARGET_2ND_CPU_ABI2 := x86
-TARGET_2ND_ARCH_VARIANT := silvermont
-TARGET_2ND_CPU_VARIANT := silvermont
-TARGET_TRANSLATE_2ND_ARCH := false
-
diff --git a/vsoc_x86_64/auto/device.mk b/vsoc_x86_64/auto/device.mk
deleted file mode 100644
index 8a0fd51..0000000
--- a/vsoc_x86_64/auto/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, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/google/cuttlefish/shared/auto/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_auto
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 auto
-# PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86_64/auto/overlay
-
diff --git a/vsoc_x86_64/go_512_phone/device.mk b/vsoc_x86_64/go_512_phone/device.mk
deleted file mode 100644
index f76bfbe..0000000
--- a/vsoc_x86_64/go_512_phone/device.mk
+++ /dev/null
@@ -1,23 +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/go_512/device.mk)
-$(call inherit-product, device/google/cuttlefish/vsoc_x86_64/phone/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_go_512_phone
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 Go 512 phone
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86_64/phone/overlay
diff --git a/vsoc_x86_64/go_phone/device.mk b/vsoc_x86_64/go_phone/device.mk
deleted file mode 100644
index acc037e..0000000
--- a/vsoc_x86_64/go_phone/device.mk
+++ /dev/null
@@ -1,23 +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/go/device.mk)
-$(call inherit-product, device/google/cuttlefish/vsoc_x86_64/phone/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_go_phone
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 Go phone
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86_64/phone/overlay
diff --git a/vsoc_x86_64/gsi/aosp_cf_x86_64_gsi.mk b/vsoc_x86_64/gsi/aosp_cf_x86_64_gsi.mk
deleted file mode 100644
index 0a9b027..0000000
--- a/vsoc_x86_64/gsi/aosp_cf_x86_64_gsi.mk
+++ /dev/null
@@ -1,38 +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, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/google/cuttlefish/shared/gsi/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_gsi
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 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_64/phone/overlay
-
diff --git a/vsoc_x86_64/pasan/device.mk b/vsoc_x86_64/pasan/device.mk
deleted file mode 100644
index c2302a8..0000000
--- a/vsoc_x86_64/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, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/google/cuttlefish/shared/phone/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_pasan
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 ASAN phone
-# Intentionally points to phone overlay to avoid code duplication
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86_64/phone/overlay
diff --git a/vsoc_x86_64/phone/device.mk b/vsoc_x86_64/phone/device.mk
deleted file mode 100644
index 41fb83a..0000000
--- a/vsoc_x86_64/phone/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, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/google/cuttlefish/shared/phone/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_phone
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 phone
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86_64/phone/overlay
-
diff --git a/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 149279a..0000000
--- a/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, 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.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="networkAttributes" translatable="false">
- <item>"mobile,0,0,0,-1,true"</item>
- <item>"wifi,1,1,1,-1,true"</item>
- <item>"mobile_mms,2,0,2,60000,true"</item>
- <item>"mobile_hipri,5,0,3,60000,true"</item>
- <item>"bluetooth,7,7,2,-1,true"</item>
- </string-array>
- <string-array name="radioAttributes" translatable="false">
- <item>"0,1"</item>
- <item>"1,1"</item>
- <item>"4,1"</item>
- <item>"7,1"</item>
- <item>"11,1"</item>
- </string-array>
- <string-array name="config_tether_wifi_regexs" translatable="false">
- <item>"wlan0"</item>
- </string-array>
- <string-array name="config_tether_apndata" translatable="false">
- <item>Android,android,,,,,,,,302,780,,default,dun,ims</item>
- </string-array>
- <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
- <bool name="config_bluetooth_address_validation">true</bool>
- <bool name="config_sms_capable">true</bool>
- <string name="default_sms_application" translatable="false">com.android.mms</string>
- <bool name="config_showNavigationBar">true</bool>
- <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
- <integer name="config_mobile_mtu">1460</integer>
- <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
- Network Offload feature. We disable the use of this feature here. -->
- <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
- <!-- Maximum number of supported users -->
- <integer name="config_multiuserMaximumUsers">4</integer>
-</resources>
diff --git a/vsoc_x86_64/tablet/device.mk b/vsoc_x86_64/tablet/device.mk
deleted file mode 100644
index 0a9ac41..0000000
--- a/vsoc_x86_64/tablet/device.mk
+++ /dev/null
@@ -1,23 +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, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/google/cuttlefish/shared/tablet/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_tablet
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 tablet
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86_64/tablet/overlay
diff --git a/vsoc_x86_64/tablet/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86_64/tablet/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 5b29ae6..0000000
--- a/vsoc_x86_64/tablet/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="networkAttributes" translatable="false">
- <item>"wifi,1,1,1,-1,true"</item>
- <item>"bluetooth,7,7,2,-1,true"</item>
- </string-array>
- <string-array name="radioAttributes" translatable="false">
- <item>"1,1"</item>
- <item>"7,1"</item>
- </string-array>
- <string-array name="config_tether_wifi_regexs" translatable="false">
- <item>"wlan0"</item>
- </string-array>
- <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
- <bool name="config_bluetooth_address_validation">true</bool>
- <bool name="config_voice_capable">false</bool>
- <bool name="config_sms_capable">false</bool>
- <string name="default_sms_application" translatable="false">com.android.mms</string>
- <bool name="config_showNavigationBar">true</bool>
- <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
-
- <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
- Network Offload feature. We disable the use of this feature here. -->
- <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
-
- <!-- Maximum number of supported users -->
- <integer name="config_multiuserMaximumUsers">8</integer>
-</resources>
diff --git a/vsoc_x86_64/tablet_3g/device.mk b/vsoc_x86_64/tablet_3g/device.mk
deleted file mode 100644
index 4fc2345..0000000
--- a/vsoc_x86_64/tablet_3g/device.mk
+++ /dev/null
@@ -1,23 +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, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/google/cuttlefish/shared/tablet_3g/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_tablet_3g
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 tablet mobile
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86_64/tablet_3g/overlay
diff --git a/vsoc_x86_64/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86_64/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 522712d..0000000
--- a/vsoc_x86_64/tablet_3g/overlay/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="networkAttributes" translatable="false">
- <item>"mobile,0,0,0,-1,true"</item>
- <item>"wifi,1,1,1,-1,true"</item>
- <item>"mobile_mms,2,0,2,60000,true"</item>
- <item>"mobile_hipri,5,0,3,60000,true"</item>
- <item>"bluetooth,7,7,2,-1,true"</item>
- </string-array>
- <string-array name="radioAttributes" translatable="false">
- <item>"0,1"</item>
- <item>"1,1"</item>
- <item>"4,1"</item>
- <item>"7,1"</item>
- <item>"11,1"</item>
- </string-array>
- <string-array name="config_tether_wifi_regexs" translatable="false">
- <item>"wlan0"</item>
- </string-array>
- <string-array name="config_tether_apndata" translatable="false">
- <item>Android,android,,,,,,,,310,260,,default,dun,ims</item>
- </string-array>
- <bool name="config_wifi_dual_band_support" translatable="false">true</bool>
- <bool name="config_bluetooth_address_validation">true</bool>
- <bool name="config_sms_capable">false</bool>
- <string name="default_sms_application" translatable="false">com.android.mms</string>
- <bool name="config_showNavigationBar">true</bool>
- <dimen name="config_viewConfigurationTouchSlop">12dp</dimen>
- <integer name="config_mobile_mtu">1460</integer>
- <!-- cuttlefish uses mac80211-hwsim, which does not support Preferred
- Network Offload feature. We disable the use of this feature here. -->
- <bool translatable="false" name="config_wifi_background_scan_support">false</bool>
- <!-- Maximum number of supported users -->
- <integer name="config_multiuserMaximumUsers">8</integer>
-</resources>
diff --git a/vsoc_x86_64/tv/device.mk b/vsoc_x86_64/tv/device.mk
deleted file mode 100644
index 12c2c46..0000000
--- a/vsoc_x86_64/tv/device.mk
+++ /dev/null
@@ -1,23 +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, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/google/cuttlefish/shared/tv/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_tv
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 tv
-# PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86_64/tv/overlay
diff --git a/vsoc_x86_64/wear/device.mk b/vsoc_x86_64/wear/device.mk
deleted file mode 100644
index 8abf465..0000000
--- a/vsoc_x86_64/wear/device.mk
+++ /dev/null
@@ -1,23 +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, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, device/google/cuttlefish/shared/wear/device.mk)
-
-PRODUCT_NAME := aosp_cf_x86_64_wear
-PRODUCT_DEVICE := vsoc_x86_64
-PRODUCT_MODEL := Cuttlefish x86_64 wear
-# PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86_64/wear/overlay
