Add 64bit Android Things target.
Bug: 110355872
Test: Builds and boots to launcher.
Change-Id: I8bb40a616c542dfc1e6be4f20690ce74cde2fb4a
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index b8d5dab..a22c8f9 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,6 +16,7 @@
PRODUCT_MAKEFILES := \
aosp_cf_x86_64_auto:$(LOCAL_DIR)/vsoc_x86_64/auto/device.mk \
+ aosp_cf_x86_64_iot:$(LOCAL_DIR)/vsoc_x86_64/iot/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_tablet:$(LOCAL_DIR)/vsoc_x86_64/tablet/device.mk \
@@ -40,6 +41,7 @@
aosp_cf_x86_tv-userdebug \
aosp_cf_x86_wear-userdebug \
aosp_cf_x86_64_auto-userdebug \
+ aosp_cf_x86_64_iot-userdebug \
aosp_cf_x86_64_phone-userdebug \
aosp_cf_x86_64_tablet-userdebug \
aosp_cf_x86_64_tablet_3g-userdebug \
diff --git a/shared/iot/device.mk b/shared/iot/device.mk
new file mode 100644
index 0000000..5ce553e
--- /dev/null
+++ b/shared/iot/device.mk
@@ -0,0 +1,26 @@
+#
+# 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/device.mk)
+$(call inherit-product, device/google/iot/iot_base.mk)
+$(call inherit-product, device/google/iot/iot_board_config_minimal.mk)
+
+PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/shared/iot/overlay
+
+PRODUCT_COPY_FILES += \
+ device/google/iot/bootanimation.zip:/system/media/bootanimation.zip \
+
+PRODUCT_FULL_TREBLE_OVERRIDE := false
diff --git a/vsoc_x86/iot/overlay/frameworks/base/core/res/res/values/config.xml b/shared/iot/overlay/frameworks/base/core/res/res/values/config.xml
similarity index 100%
copy from vsoc_x86/iot/overlay/frameworks/base/core/res/res/values/config.xml
copy to shared/iot/overlay/frameworks/base/core/res/res/values/config.xml
diff --git a/vsoc_x86/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/shared/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
similarity index 100%
copy from vsoc_x86/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
copy to shared/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
diff --git a/vsoc_x86/iot/device.mk b/vsoc_x86/iot/device.mk
index 573748a..88504ea 100644
--- a/vsoc_x86/iot/device.mk
+++ b/vsoc_x86/iot/device.mk
@@ -14,17 +14,8 @@
# limitations under the License.
#
-$(call inherit-product, device/google/cuttlefish/shared/device.mk)
-$(call inherit-product, device/google/iot/iot_base.mk)
-$(call inherit-product, device/google/iot/iot_board_config_minimal.mk)
+$(call inherit-product, device/google/cuttlefish/shared/iot/device.mk)
PRODUCT_NAME := aosp_cf_x86_iot
PRODUCT_DEVICE := vsoc_x86
-PRODUCT_MODEL := Cuttlefish x86 IoT
-PRODUCT_PACKAGE_OVERLAYS := device/google/cuttlefish/vsoc_x86/iot/overlay
-
-# Boot animation.
-PRODUCT_COPY_FILES += \
- device/google/iot/bootanimation.zip:/system/media/bootanimation.zip
-
-PRODUCT_FULL_TREBLE_OVERRIDE := false
+PRODUCT_MODEL := Cuttlefish x86 IoT
\ No newline at end of file
diff --git a/vsoc_x86_64/iot/device.mk b/vsoc_x86_64/iot/device.mk
new file mode 100644
index 0000000..25a28a8
--- /dev/null
+++ b/vsoc_x86_64/iot/device.mk
@@ -0,0 +1,22 @@
+#
+# 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/iot/device.mk)
+
+PRODUCT_NAME := aosp_cf_x86_64_iot
+PRODUCT_DEVICE := vsoc_x86_64
+PRODUCT_MODEL := Cuttlefish x86_64 IoT
\ No newline at end of file
diff --git a/vsoc_x86/iot/overlay/frameworks/base/core/res/res/values/config.xml b/vsoc_x86_64/iot/overlay/frameworks/base/core/res/res/values/config.xml
similarity index 100%
rename from vsoc_x86/iot/overlay/frameworks/base/core/res/res/values/config.xml
rename to vsoc_x86_64/iot/overlay/frameworks/base/core/res/res/values/config.xml
diff --git a/vsoc_x86/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/vsoc_x86_64/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
similarity index 100%
rename from vsoc_x86/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
rename to vsoc_x86_64/iot/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
