Bring back aosp_cf_x86_64_phone

Bug: 130887841
Change-Id: If253bbad93c77bc778da1a0a81fd7bad5207f591
Merged-In: If253bbad93c77bc778da1a0a81fd7bad5207f591

4 files changed, 112 insertions, 0 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index cc43a544f..09f33df87 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,6 +16,7 @@
 
 PRODUCT_MAKEFILES := \
 	aosp_cf_arm64_phone:$(LOCAL_DIR)/vsoc_arm64/phone/device.mk \
+	aosp_cf_x86_64_phone:$(LOCAL_DIR)/vsoc_x86_64/phone/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 \
@@ -25,6 +26,7 @@ PRODUCT_MAKEFILES := \
 
 COMMON_LUNCH_CHOICES := \
 	aosp_cf_arm64_phone-userdebug \
+	aosp_cf_x86_64_phone-userdebug \
 	aosp_cf_x86_auto-userdebug \
 	aosp_cf_x86_phone-userdebug \
 	aosp_cf_x86_tv-userdebug
diff --git a/vsoc_x86_64/BoardConfig.mk b/vsoc_x86_64/BoardConfig.mk
new file mode 100644
index 000000000..8c2fa6753
--- /dev/null
+++ b/vsoc_x86_64/BoardConfig.mk
@@ -0,0 +1,34 @@
+#
+# 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/phone/device.mk b/vsoc_x86_64/phone/device.mk
new file mode 100644
index 000000000..41fb83a99
--- /dev/null
+++ b/vsoc_x86_64/phone/device.mk
@@ -0,0 +1,24 @@
+#
+# 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
new file mode 100644
index 000000000..149279a6d
--- /dev/null
+++ b/vsoc_x86_64/phone/overlay/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,52 @@
+<?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>