Skip to content

Add Core 1 development credential path #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devteapot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Core 1 development credential path #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ members = [
"crates/android-provider-acceptance",
"crates/android-system-authority",
"crates/compositor-control-protocol",
"crates/core-agent-contract-test",
"crates/core-dev-credential-protocol-test",
"crates/experience-host-protocol",
"crates/experience-ir",
"crates/linux-input-method",
Expand Down
39 changes: 39 additions & 0 deletions aosp/device/sos/a33x/Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@ cc_binary {
],
}

// Packaged only by the explicit Core development-credential product switch.
// It has one stdin-only protocol and never accepts credential bytes in argv.
cc_binary {
name: "sos-core-dev-credential",
srcs: ["core/dev_credential_client.cpp"],
compile_multilib: "64",
system_ext_specific: true,
cflags: [
"-Wall",
"-Werror",
"-Wextra",
],
}

cc_binary {
name: "sos-core-platform-adapter",
stem: "sos-core-platform",
Expand Down Expand Up @@ -230,6 +244,20 @@ cc_prebuilt_binary {
},
}

// Packaged only by Core-dev. Its distinct executable label enters the sole
// agent domain permitted to reach the fixed adb-reverse loopback port.
cc_prebuilt_binary {
name: "sos-node-core-dev",
srcs: ["prebuilts/arm64/sos-node"],
stem: "sos-node-core-dev",
compile_multilib: "64",
check_elf_files: false,
system_ext_specific: true,
strip: {
none: true,
},
}

cc_prebuilt_library_shared {
name: "sos-node-cxx-shared",
srcs: ["prebuilts/arm64/libc++_shared.so"],
Expand All @@ -250,6 +278,17 @@ prebuilt_etc {
system_ext_specific: true,
}

// Core-dev uses a distinct immutable path. Keeping the module output and
// install identity distinct prevents Soong from emitting two Make recipes for
// one destination even when only one module belongs to the selected product.
prebuilt_etc {
name: "sos-agent-runner-core-dev",
src: "prebuilts/sos-agent/agent-runner-core-dev.cjs",
filename: "agent-runner-core-dev.cjs",
sub_dir: "sos-agent",
system_ext_specific: true,
}

prebuilt_etc {
name: "sos-agent-experience-api",
src: "prebuilts/sos-agent/experience-api.md",
Expand Down
6 changes: 6 additions & 0 deletions aosp/device/sos/a33x/AndroidProducts.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,10 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/lineage_sos_compat_a33x.mk \
$(LOCAL_DIR)/lineage_sos_core0b_a33x.mk \
$(LOCAL_DIR)/lineage_sos_core1_a33x.mk \
$(LOCAL_DIR)/lineage_sos_core1_dev_a33x.mk \
$(LOCAL_DIR)/lineage_sos_core_a33x.mk

# The credential-bearing product is deliberately exposed only as a
# debuggable lunch choice. Its product makefile rejects a user build too.
COMMON_LUNCH_CHOICES += \
lineage_sos_core1_dev_a33x-userdebug
Loading