Skip to content

Commit 1c69c3f

Browse files
NotKitNotKit
committed
Adapt device tree for Halium 10
Based on https://github.com/erfanoabdi/android_device_anbox_anbox_arm64
1 parent dc9e416 commit 1c69c3f

11 files changed

Lines changed: 91 additions & 81 deletions

‎Android.bp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
soong_namespace {
2+
}

‎AndroidProducts.mk‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
PRODUCT_MAKEFILES := \
22
$(LOCAL_DIR)/lineage_halium_arm64.mk
3+
4+
COMMON_LUNCH_CHOICES := \
5+
lineage_halium_arm64-user \
6+
lineage_halium_arm64-userdebug \
7+
lineage_halium_arm64-eng

‎BoardConfig.mk‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,34 @@ DEVICE_PATH := device/halium/halium_arm64
2020

2121
include build/make/target/board/generic_arm64_ab/BoardConfig.mk
2222

23-
# Ramdisk
24-
BOARD_ROOT_EXTRA_FOLDERS += efs
23+
TARGET_USES_64_BIT_BINDER := true
2524

26-
# Soong namespaces
27-
PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH)
25+
# APEX
26+
TARGET_FLATTEN_APEX := true
27+
28+
# Platform
29+
TARGET_BOARD_PLATFORM := halium
30+
31+
# Kernel
32+
TARGET_NO_KERNEL := true
33+
34+
# Audio
35+
USE_XML_AUDIO_POLICY_CONF := 1
36+
37+
# Bootloader
38+
TARGET_NO_BOOTLOADER := true
39+
40+
# Display
41+
TARGET_USES_HWC2 := true
42+
43+
# Filesystem
44+
TARGET_USERIMAGES_USE_EXT4 := true
45+
46+
# HIDL
47+
DEVICE_FRAMEWORK_MANIFEST_FILE := $(DEVICE_PATH)/framework_manifest.xml
48+
49+
# Partitions
50+
TARGET_COPY_OUT_VENDOR := vendor
51+
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
52+
BOARD_VENDORIMAGE_PARTITION_SIZE := 314572800
53+
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Device configuration for generic Halium 9 systemimage
1+
Device configuration for generic Halium 10 systemimage
22
=====================================================

‎device.mk‎

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
# limitations under the License.
1515
#
1616

17-
# Properties
18-
-include $(LOCAL_PATH)/system_prop.mk
19-
2017
# Enable dynamic partition size
2118
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
2219

@@ -27,24 +24,10 @@ PRODUCT_PACKAGES += \
2724
vndk-detect \
2825
on-post-data.sh
2926

30-
# Support for the O devices
31-
PRODUCT_COPY_FILES += \
32-
build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc \
33-
build/make/target/product/vndk/init.vndk-27.rc:system/etc/init/gsi/init.vndk-27.rc \
34-
$(LOCAL_PATH)/configs/ld.config.26.txt:system/etc/ld.config.26.txt
35-
27+
# Keymaster
3628
PRODUCT_PACKAGES += \
37-
init.vndk-26.rc \
38-
ld.config.27.txt \
39-
llndk.libraries.27.txt \
40-
vndksp.libraries.27.txt
41-
42-
PRODUCT_PACKAGES += \
43-
vndk_v27_arm64
44-
45-
# Name space configuration file for non-enforcing VNDK
46-
PRODUCT_PACKAGES += \
47-
ld.config.vndk_lite.txt
29+
android.hardware.keymaster@3.0-impl \
30+
android.hardware.keymaster@3.0-service
4831

4932
# SPL fix
5033
PRODUCT_PACKAGES += \
@@ -55,21 +38,10 @@ PRODUCT_PACKAGES += \
5538
bootctl \
5639
vintf
5740

58-
# Misc
59-
PRODUCT_PACKAGES += \
60-
libandroid \
61-
libandroid_runtime \
62-
libdrm \
63-
libion \
64-
vendor.display.config@1.7
65-
66-
# Media
41+
# Halium
6742
PRODUCT_PACKAGES += \
68-
libmedia_omx \
69-
android.frameworks.displayservice@1.0 \
70-
drmserver \
71-
mediadrmserver \
72-
mediaextractor
43+
libhwc2_compat_layer
7344

74-
PRODUCT_PACKAGES += \
75-
sensorservice
45+
# Soong
46+
PRODUCT_SOONG_NAMESPACES += \
47+
$(LOCAL_PATH)

‎fixSPL/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
22

33
include $(CLEAR_VARS)
44
LOCAL_MODULE := getSPL
5-
LOCAL_MODULE_TAGS := optional eng
5+
LOCAL_MODULE_TAGS := optional
66
LOCAL_MODULE_CLASS := EXECUTABLES
77
LOCAL_SRC_FILES := getSPL.arm
88
include $(BUILD_PREBUILT)

‎framework_manifest.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!-- Copyright (c) 2018, The Linux Foundation. All rights reserved.
2+
3+
Redistribution and use in source and binary forms, with or without
4+
modification, are permitted provided that the following conditions are
5+
met:
6+
* Redistributions of source code must retain the above copyright
7+
notice, this list of conditions and the following disclaimer.
8+
* Redistributions in binary form must reproduce the above
9+
copyright notice, this list of conditions and the following
10+
disclaimer in the documentation and/or other materials provided
11+
with the distribution.
12+
* Neither the name of The Linux Foundation nor the names of its
13+
contributors may be used to endorse or promote products derived
14+
from this software without specific prior written permission.
15+
16+
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
17+
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
19+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
20+
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
23+
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24+
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
25+
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
26+
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
-->
28+
<manifest version="1.0" type="framework">
29+
<hal format="hidl" override="true">
30+
<name>android.hardware.keymaster</name>
31+
<transport>hwbinder</transport>
32+
<impl level="generic"></impl>
33+
<version>3.0</version>
34+
<interface>
35+
<name>IKeymasterDevice</name>
36+
<instance>softwareonly</instance>
37+
</interface>
38+
</hal>
39+
</manifest>

‎lineage_halium_arm64.mk‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,9 @@
1616

1717
# Inherit from those products. Most specific first.
1818
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
19+
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
1920
$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk)
2021

21-
# Inherit from phh vndk vendor.
22-
$(call inherit-product, vendor/vndk/vndk.mk)
23-
24-
# Inherit some common Lineage stuff
25-
$(call inherit-product, $(SRC_TARGET_DIR)/product/halium.mk)
26-
2722
# Inherit device
2823
$(call inherit-product, $(LOCAL_PATH)/device.mk)
2924

‎rootdir/Android.mk‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,30 @@ include $(CLEAR_VARS)
66

77
include $(CLEAR_VARS)
88
LOCAL_MODULE := init.halium.rc
9-
LOCAL_MODULE_TAGS := optional eng
9+
LOCAL_MODULE_TAGS := optional
1010
LOCAL_MODULE_CLASS := ETC
1111
LOCAL_SRC_FILES := etc/init.halium.rc
1212
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init
1313
include $(BUILD_PREBUILT)
1414

1515
include $(CLEAR_VARS)
1616
LOCAL_MODULE := init.disabled.rc
17-
LOCAL_MODULE_TAGS := optional eng
17+
LOCAL_MODULE_TAGS := optional
1818
LOCAL_MODULE_CLASS := ETC
1919
LOCAL_SRC_FILES := etc/init.disabled.rc
2020
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init
2121
include $(BUILD_PREBUILT)
2222

23-
include $(CLEAR_VARS)
24-
LOCAL_MODULE := init.vndk-26.rc
25-
LOCAL_MODULE_TAGS := optional eng
26-
LOCAL_MODULE_CLASS := ETC
27-
LOCAL_SRC_FILES := etc/gsi/init.vndk-26.rc
28-
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/init/gsi
29-
include $(BUILD_PREBUILT)
30-
3123
include $(CLEAR_VARS)
3224
LOCAL_MODULE := vndk-detect
33-
LOCAL_MODULE_TAGS := optional eng
25+
LOCAL_MODULE_TAGS := optional
3426
LOCAL_MODULE_CLASS := EXECUTABLES
3527
LOCAL_SRC_FILES := bin/vndk-detect
3628
include $(BUILD_PREBUILT)
3729

3830
include $(CLEAR_VARS)
3931
LOCAL_MODULE := on-post-data.sh
40-
LOCAL_MODULE_TAGS := optional eng
32+
LOCAL_MODULE_TAGS := optional
4133
LOCAL_MODULE_CLASS := EXECUTABLES
4234
LOCAL_SRC_FILES := bin/on-post-data.sh
4335
include $(BUILD_PREBUILT)

‎rootdir/etc/gsi/init.vndk-26.rc‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)