fix(chip-aosp): fuse Eliza product and activate HAL contracts

Author: lalalune

packages/chip/scripts/boot_android_simulator.sh

@@ -13,8 +13,8 @@ report="${ANDROID_SIM_BOOT_REPORT:-$repo_root/build/reports/android_sim_boot.jso
 evidence_dir="$repo_root/docs/evidence/android"
 aosp_dir=${AOSP_DIR:-}
 aosp_shell=${AOSP_SHELL:-bash}
-aosp_product=${AOSP_PRODUCT:-eliza_ai_soc-trunk_staging-userdebug}
-aosp_cuttlefish_product=${AOSP_CUTTLEFISH_PRODUCT:-aosp_cf_riscv64_phone-trunk_staging-userdebug}
+aosp_product=${AOSP_PRODUCT:-eliza_openagent_ai_soc_phone-trunk_staging-userdebug}
+aosp_cuttlefish_product=${AOSP_CUTTLEFISH_PRODUCT:-eliza_cf_riscv64_phone-trunk_staging-userdebug}
 aosp_cuttlefish_args=${AOSP_CUTTLEFISH_ARGS:---cpus=4 --memory_mb=8192 --gpu_mode=none}
 aosp_cuttlefish_launcher=${AOSP_CUTTLEFISH_LAUNCHER:-}
 aosp_adb_timeout_seconds=${AOSP_ADB_TIMEOUT_SECONDS:-180}

packages/chip/scripts/check_aosp_product_contract.py

@@ -192,6 +192,10 @@ def run_check(args: argparse.Namespace) -> dict[str, object]:
     openagent_inherits = inherit_products(openagent_text)
     chip_packages = makefile_product_packages(chip_device_text)
     os_common_packages = makefile_product_packages(os_common_text)
+    chip_inherits_eliza_common = "vendor/eliza/eliza_common.mk" in chip_inherits
+    effective_chip_packages = chip_packages | (
+        os_common_packages if chip_inherits_eliza_common else set()
+    )
     local_dests = local_manifest_dests(LOCAL_MANIFEST)
     chip_manifest_hals = manifest_hal_names(CHIP_MANIFEST)
 
@@ -235,10 +239,10 @@ def run_check(args: argparse.Namespace) -> dict[str, object]:
     )
     add_if(
         findings,
-        bool(REQUIRED_ELIZA_PACKAGES - chip_packages),
+        bool(REQUIRED_ELIZA_PACKAGES - effective_chip_packages),
         "chip_product_missing_eliza_privapp_packages",
         "chip eliza_ai_soc product does not install the Eliza privileged app and permission XML packages",
-        f"missing={sorted(REQUIRED_ELIZA_PACKAGES - chip_packages)} chip_packages={sorted(chip_packages)}",
+        f"missing={sorted(REQUIRED_ELIZA_PACKAGES - effective_chip_packages)} effective_packages={sorted(effective_chip_packages)}",
         "Install the Eliza APK, default-permissions XML, and privapp permissions in the selected chip Android product.",
     )
     add_if(
@@ -310,6 +314,7 @@ def run_check(args: argparse.Namespace) -> dict[str, object]:
         "chip_product_inherits": sorted(chip_inherits),
         "os_openagent_inherits": sorted(openagent_inherits),
         "chip_product_packages": sorted(chip_packages),
+        "effective_chip_product_packages": sorted(effective_chip_packages),
         "os_common_packages": sorted(os_common_packages),
         "local_manifest_dest_count": len(local_dests),
         "chip_vintf_hals": sorted(chip_manifest_hals),

packages/chip/sw/aosp-device/build-aosp-riscv64.sh

@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
-# build-aosp-riscv64.sh - AOSP build pipeline for the Cuttlefish riscv64 target,
-# overlaid with the eliza_ai_soc device tree.
+# build-aosp-riscv64.sh - AOSP build pipeline for the fused Eliza OpenAgent
+# E1 RISC-V AI SoC product.
 #
-# Default lunch combo:  aosp_cf_riscv64_phone-trunk_staging-userdebug
-# Optional lunch combo: eliza_ai_soc-trunk_staging-userdebug (requires the
-#                       overlay-mode=local-manifest path so the project is sync'd
-#                       under the AOSP tree with a proper repo project entry).
+# Default lunch combo: eliza_openagent_ai_soc_phone-trunk_staging-userdebug
+# Reference-only combo: aosp_cf_riscv64_phone-trunk_staging-userdebug.
 #
 # This script is intentionally idempotent enough to re-run incrementally:
 #   * Pre-flight is non-destructive.
@@ -26,6 +24,7 @@ SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
 CHIP_ROOT=$(cd -- "$SCRIPT_DIR/../.." && pwd)
 ELIZA_ROOT=$(cd -- "$CHIP_ROOT/../.." && pwd)
 DEVICE_OVERLAY_SRC="$SCRIPT_DIR/device/eliza/eliza_ai_soc"
+ELIZA_VENDOR_SRC="$ELIZA_ROOT/packages/os/android/vendor/eliza"
 LOCAL_MANIFEST_TEMPLATE="$SCRIPT_DIR/local_manifests/eliza.xml"
 
 usage() {
@@ -38,7 +37,7 @@ required:
 build options:
   --branch BRANCH         AOSP manifest branch (default: android-latest-release).
   --lunch-target COMBO    Lunch target
-                          (default: aosp_cf_riscv64_phone-trunk_staging-userdebug).
+                          (default: eliza_openagent_ai_soc_phone-trunk_staging-userdebug).
   --jobs N                Parallelism for repo sync and `m`
                           (default: $(nproc)).
   --device-overlay-mode MODE
@@ -80,7 +79,7 @@ warn() { printf '[%s] WARN:  %s\n' "$(date -u +%Y-%m-%dT%H:%M:%SZ)" "$*" >&2; }
 
 WORKSPACE=""
 BRANCH="android-latest-release"
-LUNCH_TARGET="aosp_cf_riscv64_phone-trunk_staging-userdebug"
+LUNCH_TARGET="eliza_openagent_ai_soc_phone-trunk_staging-userdebug"
 JOBS=$(nproc 2>/dev/null || echo 4)
 OVERLAY_MODE="symlink"
 RESYNC=0
@@ -138,6 +137,9 @@ for required in \
   "$DEVICE_OVERLAY_SRC/device.mk" \
   "$DEVICE_OVERLAY_SRC/manifest.xml" \
   "$DEVICE_OVERLAY_SRC/eliza_e1.xml" \
+  "$ELIZA_VENDOR_SRC/AndroidProducts.mk" \
+  "$ELIZA_VENDOR_SRC/eliza_common.mk" \
+  "$ELIZA_VENDOR_SRC/products/eliza_openagent_ai_soc_phone.mk" \
   "$LOCAL_MANIFEST_TEMPLATE"; do
   [ -f "$required" ] || die "missing repo artifact: $required"
 done
@@ -246,8 +248,9 @@ run_repo_sync() {
 }
 
 install_overlay_symlinks() {
-  log "overlay: dropping symlinks into device/eliza/eliza_ai_soc/"
+  log "overlay: dropping symlinks into device/eliza/eliza_ai_soc/ and vendor/eliza/"
   local dst="$WORKSPACE/device/eliza/eliza_ai_soc"
+  local vendor_dst="$WORKSPACE/vendor/eliza"
   mkdir -p "$dst"
   # Mirror the layout exactly. We symlink files (not the whole dir) so any
   # additions to the overlay are picked up on the next run.
@@ -257,6 +260,13 @@ install_overlay_symlinks() {
     mkdir -p "$dst/$(dirname "$rel")"
     ln -sfn "$DEVICE_OVERLAY_SRC/$rel" "$dst/$rel"
   done
+  mkdir -p "$vendor_dst"
+  cd "$ELIZA_VENDOR_SRC"
+  find . -type f -print0 | while IFS= read -r -d '' rel; do
+    rel=${rel#./}
+    mkdir -p "$vendor_dst/$(dirname "$rel")"
+    ln -sfn "$ELIZA_VENDOR_SRC/$rel" "$vendor_dst/$rel"
+  done
 }
 
 install_overlay_local_manifest() {
@@ -287,6 +297,13 @@ install_overlay() {
     [ -f "$WORKSPACE/device/eliza/eliza_ai_soc/$rel" ] \
       || die "overlay install: device/eliza/eliza_ai_soc/$rel did not materialize"
   done
+  for rel in \
+    AndroidProducts.mk \
+    eliza_common.mk \
+    products/eliza_openagent_ai_soc_phone.mk; do
+    [ -f "$WORKSPACE/vendor/eliza/$rel" ] \
+      || die "overlay install: vendor/eliza/$rel did not materialize"
+  done
 }
 
 run_build() {
@@ -314,8 +331,8 @@ run_build() {
 # Derive the product output directory from the lunch combo.
 product_out_dir() {
   case "$LUNCH_TARGET" in
-    aosp_cf_riscv64_phone-*) echo "$WORKSPACE/out/target/product/vsoc_riscv64" ;;
-    eliza_ai_soc-*)          echo "$WORKSPACE/out/target/product/eliza_ai_soc" ;;
+    aosp_cf_riscv64_phone-*)             echo "$WORKSPACE/out/target/product/vsoc_riscv64" ;;
+    eliza_ai_soc-*|eliza_openagent_ai_soc_phone-*) echo "$WORKSPACE/out/target/product/eliza_ai_soc" ;;
     *)
       local short=${LUNCH_TARGET%%-*}
       echo "$WORKSPACE/out/target/product/${short}"

packages/chip/sw/aosp-device/device/eliza/eliza_ai_soc/BoardConfig.mk

@@ -16,9 +16,6 @@ TARGET_CPU_VARIANT := generic
 # simulator base.
 -include device/google/cuttlefish/vsoc_riscv64/BoardConfig.mk
 
-# Temporary workaround matching AOSP riscv64 targets while prebuilts lack
-# riscv64 variants.
-ALLOW_MISSING_DEPENDENCIES := true
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := false
 BOARD_KERNEL_CMDLINE += console=ttyS0 earlycon androidboot.hardware=eliza_ai_soc

packages/chip/sw/aosp-device/device/eliza/eliza_ai_soc/device.mk

@@ -17,20 +17,11 @@ PRODUCT_COPY_FILES += \
     device/eliza/eliza_ai_soc/init.eliza.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.eliza.rc \
     device/eliza/eliza_ai_soc/fstab.eliza:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.eliza
 
-# HAL service binaries.
-#
-# Future integration points:
-#   android.hardware.graphics.composer@2.4-service
-#   hwcomposer.eliza_ai_soc
-#   vendor.eliza.e1_npu@1.0-service
-# HAL package names are intentionally not listed until source or prebuilts are
-# imported into the external AOSP tree. Keeping these out of PRODUCT_PACKAGES
-# prevents vendorimage from passing with misleading, unimplemented services.
-#
-# Future external-tree packages:
-#   hwcomposer.eliza_ai_soc
-#   e1_npu.default
-#
+PRODUCT_PACKAGES += \
+    android.hardware.graphics.composer@2.4-service.eliza_ai_soc \
+    hwcomposer.eliza_ai_soc \
+    vendor.eliza.e1_npu@1.0-service
+
 # WiFi/Bluetooth packages, permissions, overlays, supplicant/hostapd configs,
 # and Android feature XML are intentionally absent until the external module
 # has host-controller, firmware, regulatory, and framework evidence.

packages/chip/sw/aosp-device/device/eliza/eliza_ai_soc/eliza_ai_soc.mk

@@ -3,6 +3,7 @@
 # contract on top.
 $(call inherit-product, device/google/cuttlefish/vsoc_riscv64/phone/aosp_cf.mk)
 $(call inherit-product, device/eliza/eliza_ai_soc/device.mk)
+$(call inherit-product, vendor/eliza/eliza_common.mk)
 
 PRODUCT_NAME := eliza_ai_soc
 PRODUCT_DEVICE := eliza_ai_soc

packages/chip/sw/aosp-device/device/eliza/eliza_ai_soc/hal/e1_npu/Android.bp

@@ -11,6 +11,18 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+hidl_interface {
+    name: "vendor.eliza.e1_npu@1.0",
+    root: "vendor.eliza",
+    srcs: [
+        "IE1Npu.hal",
+    ],
+    interfaces: [
+        "android.hidl.base@1.0",
+    ],
+    gen_java: false,
+}
+
 cc_binary {
     name: "vendor.eliza.e1_npu@1.0-service",
     relative_install_path: "hw",

packages/chip/sw/aosp-device/device/eliza/eliza_ai_soc/hal/e1_npu/E1Npu.h

@@ -35,7 +35,7 @@ class E1Npu : public IE1Npu {
     // Offset into the device that returns the driver identity word.
     // Matches sw/linux/drivers/e1/e1_platform_contract.h
     // (E1_NPU_RESULT_OFFSET).
-    static constexpr off_t kResultOffset = 0x10;
+    static constexpr off_t kResultOffset = 0x08;
 };
 
 }  // namespace implementation

packages/chip/sw/aosp-device/device/eliza/eliza_ai_soc/hal/e1_npu/vendor.eliza.e1_npu@1.0-service.rc

@@ -3,8 +3,6 @@ service vendor.e1_npu /vendor/bin/hw/vendor.eliza.e1_npu@1.0-service
     class hal
     user system
     group system
-    disabled
-    oneshot
 
 on property:vendor.e1_npu.ready=1
     start vendor.e1_npu

packages/chip/sw/aosp-device/device/eliza/eliza_ai_soc/init.eliza.rc

@@ -4,8 +4,8 @@
 # Backing kernel node: /dev/e1-npu.
 #
 # Policy:
-#   - The e1_npu HAL package is not started from this root init scaffold until
-#     the matching service binary is included in PRODUCT_PACKAGES.
+#   - The e1_npu HAL starts only after post-fs ownership/mode setup for the
+#     backing kernel device has run.
 #   - The hwcomposer HAL is the only graphics HAL declared. There is no
 #     surfaceflinger override and no GLES library mapping.
 #   - No audio, camera, radio, BT, WiFi, sensors, or thermal services.
@@ -22,3 +22,4 @@ on post-fs
     chmod 0660 /dev/e1-npu
     # Vendor scratch directory for the HAL (no persistent state in v0).
     mkdir /mnt/vendor/e1_npu 0770 system system
+    setprop vendor.e1_npu.ready 1