diff --git a/README.md b/README.md index dbda65ed14c1deb23885a60979b9d6cb927162ba..89c5969000b3501bddd92bebe0d0ec9ebcde0580 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,7 @@ 云手机AOSP14开源代码,用于构建运行在华为云手机服务器的Android14镜像 #### 软件架构 -本软件基于AOSP 14.0.0_r75开发,支持修改以下路径中的源码 -``` -aosp/frameworks -aosp/packages -aosp/vendor -``` +本软件基于AOSP 14.0.0_r75开发 #### 内容摘要 一 客户对接阶段 @@ -62,8 +57,8 @@ aosp/vendor ###### 3.1 fork本仓库,本地修改代码 ``` 建议: -1. 在aosp/vendor/common/android 目录下放置新增的代码文件或者预编译产物 -2. 在aosp/vendor/common/products/product_extra.mk 中声明构建规则 +1. 在aosp/vendor/isula目录下放置新增的代码文件或者预编译产物 +2. 在aosp/vendor/isula/packages.mk 中声明构建规则 3. 如无特殊需求,不要修改aosp/vendor目录下的其他文件,否则可能会对镜像的基本功能造成影响 ``` @@ -160,9 +155,14 @@ keytool -printcert -file platform.x509.pem |-- shared.x509.pem |-- testkey.pk8 |-- testkey.x509.pem -|-- verity_key -|-- veritykey.pk8 -`-- veritykey.x509.pem +|-- sdk_sandbox.pk8 +|-- sdk_sandbox.x509.pem +|-- bluetooth.pk8 +|-- bluetooth.x509.pem +|-- nfc.pk8 +|-- nfc.x509.pem +|-- networkstack.pk8 +|-- networkstack.x509.pem ``` 依次执行以下命令完成打包: ``` @@ -188,7 +188,7 @@ gpg --recipient C5C7A35662A6F8080E27AB464A8E757D9B31879E --output security.tar.g ###### 6.4 上传私有系统签名文件 将加密后的私有系统签名文件包提交到代码仓的以下路径: ``` -/aosp/vendor/common/android/security/security.tar.gz.gpg +/aosp/vendor/common/certificates/security.tar.gz.gpg ``` ##### 7. 版本管理 diff --git a/aosp/vendor/isula/common.mk b/aosp/vendor/isula/common.mk index 0a4a0ee6f105469f79448ca6bd1ee34b78e4fe9a..683a7f95e325572d5c12fd103f37b3037c23da7d 100644 --- a/aosp/vendor/isula/common.mk +++ b/aosp/vendor/isula/common.mk @@ -12,7 +12,6 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk) $(call inherit-product, vendor/isula/packages.mk) $(call inherit-product, vendor/isula/properties.mk) $(call inherit-product, vendor/isula/copyfiles.mk) -$(call inherit-product, vendor/isula/customer.mk) # product config PRODUCT_AAPT_CONFIG := normal xhdpi @@ -21,7 +20,7 @@ PRODUCT_LOCALES := zh_CN en_US PRODUCT_SHIPPING_API_LEVEL := 34 PRODUCT_FULL_TREBLE_OVERRIDE := true PRODUCT_ENABLE_UFFD_GC := true -PRODUCT_DEFAULT_DEV_CERTIFICATE := build/target/product/security/releasekey +PRODUCT_DEFAULT_DEV_CERTIFICATE := vendor/common/certificates/releasekey PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # target config diff --git a/aosp/vendor/isula/customer.mk b/aosp/vendor/isula/customer.mk deleted file mode 100644 index d3d4e271311b002c04f1deb48d515e061db6290d..0000000000000000000000000000000000000000 --- a/aosp/vendor/isula/customer.mk +++ /dev/null @@ -1,5 +0,0 @@ -# -# Copyright (c) Huawei Technologies Co., Ltd. 2025-2025. All rights reserved. -# Description: common makefile for customer lunch -# -