Update the auto config
Test: auto builds, boots
BUG: 110695415
Change-Id: I9dd2bc7f489ae74582af3048bd6dccba1509a41f
Merged-In: I9dd2bc7f489ae74582af3048bd6dccba1509a41f
(cherry picked from commit f933cba2e00c70089c3bc5b84fc786e35450e2ab)
diff --git a/shared/auto/device.mk b/shared/auto/device.mk
index cc7e211..dafff37 100644
--- a/shared/auto/device.mk
+++ b/shared/auto/device.mk
@@ -14,5 +14,58 @@
# limitations under the License.
#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk)
+################################################
+# Begin GCE specific configurations
+
$(call inherit-product, device/google/cuttlefish/shared/device.mk)
+
+################################################
+# Begin general Android Auto Embedded configurations
+
+PRODUCT_COPY_FILES += \
+ packages/services/Car/car_product/init/init.bootstat.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw//init.bootstat.rc \
+ packages/services/Car/car_product/init/init.car.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw//init.car.rc
+
+# Auto core hardware permissions
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/car_core_hardware.xml:system/etc/permissions/car_core_hardware.xml \
+ frameworks/native/data/etc/android.hardware.type.automotive.xml:system/etc/permissions/android.hardware.type.automotive.xml \
+
+# Enable landscape
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.screen.landscape.xml:system/etc/permissions/android.hardware.screen.landscape.xml
+
+# Location permissions
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml
+
+PRODUCT_PROPERTY_OVERRIDES += \
+ android.car.hvac.demo=true
+
+# vehicle HAL
+PRODUCT_PACKAGES += android.hardware.automotive.vehicle@2.0-service
+
+# DRM HAL
+PRODUCT_PACKAGES += \
+ android.hardware.drm@1.0-impl \
+ android.hardware.drm@1.0-service
+
+# GPS HAL
+PRODUCT_PACKAGES += \
+ gps.vsoc_x86 \
+ android.hardware.gnss@1.0-impl
+
+# DRM Properities
+PRODUCT_PROPERTY_OVERRIDES += \
+ drm.service.enabled=true
+
+# Add car related sepolicy
+# TODO: Now use sepolicies from car emulator for test. Create a separate one for GCE
+BOARD_SEPOLICY_DIRS += \
+ device/generic/car/common/sepolicy \
+
+BOARD_IS_AUTOMOTIVE := true
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
+$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
+$(call inherit-product, packages/services/Car/car_product/build/car.mk)
diff --git a/shared/config/Android.mk b/shared/config/Android.mk
index 3fc2d73..9a75f3f 100644
--- a/shared/config/Android.mk
+++ b/shared/config/Android.mk
@@ -38,12 +38,20 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := cuttlefish_dtb
+LOCAL_MODULE := initrd_root_dtb
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(HOST_OUT)/config
-LOCAL_MODULE_STEM := cuttlefish.dtb
-LOCAL_SRC_FILES := \
- initrd-root.dtb \
- system-root.dtb
+LOCAL_MODULE_STEM := initrd-root.dtb
+LOCAL_SRC_FILES := initrd-root.dtb
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := system_root_dtb
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(HOST_OUT)/config
+LOCAL_MODULE_STEM := system-root.dtb
+LOCAL_SRC_FILES := system-root.dtb
include $(BUILD_PREBUILT)
