Enable BOARD_BUILD_SYSTEM_ROOT_IMAGE.
This enables a mode where the initramfs (ramdisk.img) and system.img
files are combined into a bootable 'root' system.img. It is needed for
GSI compatibility and treble compliance.
The device tree blob is also moved over to the 'cuttlefish' project as
it can no longer be shared with previous releases (because 'system'
cannot be defined in the fdt any more.)
Bug: 110097226
Change-Id: Ibd011c6f2a7cdfdc36e695e717b337b563784876
Merged-In: Ibd011c6f2a7cdfdc36e695e717b337b563784876
(cherry picked from commit b109e501016fec3008c7dce1673156555be7b2a9)
diff --git a/host/config/Android.mk b/host/config/Android.mk
deleted file mode 100644
index 59298fc..0000000
--- a/host/config/Android.mk
+++ /dev/null
@@ -1,27 +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.
-
-#
-# Common definitions for all variants.
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := cuttlefish_dtb
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/config
-LOCAL_MODULE_STEM := cuttlefish.dtb
-LOCAL_SRC_FILES := cuttlefish.dtb
-include $(BUILD_PREBUILT)
diff --git a/host/config/cuttlefish.dtb b/host/config/cuttlefish.dtb
deleted file mode 100644
index 1c75cd6..0000000
--- a/host/config/cuttlefish.dtb
+++ /dev/null
Binary files differ
diff --git a/host/config/cuttlefish.dts b/host/config/cuttlefish.dts
deleted file mode 100644
index 70a34fc..0000000
--- a/host/config/cuttlefish.dts
+++ /dev/null
@@ -1,43 +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.
- */
-
-/dts-v1/;
-
-/ {
- firmware {
- android {
- compatible = "android,firmware";
- fstab {
- compatible = "android,fstab";
- system {
- compatible = "android,system";
- dev = "/dev/block/vda";
- type = "ext4";
- mnt_flags = "noatime,ro,errors=panic";
- fsmgr_flags = "wait";
- };
-
- vendor {
- compatible = "android,vendor";
- dev = "/dev/block/vdd";
- type = "ext4";
- mnt_flags = "noatime,ro,errors=panic";
- fsmgr_flags = "wait";
- };
- };
- };
- };
-};
