diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-17 03:21:32 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-17 03:21:32 +0000 |
commit | 43fbbfa2e0de4ddb54cf97d854bb6b8bb1a3884f (patch) | |
tree | 4925d974c5c6eac7db452f206e076673bf914d54 | |
parent | b793eb5044cc728f590ce915956b3d48d2bcc9de (diff) | |
parent | 6e3710f107248dfbefbf79aaf81caca73a742cab (diff) | |
download | libbootloader-android13-frc-networking-release.tar.gz |
Snap for 8191477 from 6e3710f107248dfbefbf79aaf81caca73a742cab to tm-frc-networking-releaset_frc_net_330443000android13-frc-networking-release
Change-Id: I8c80750dc82c5c2f1db8ba8598d56d7cd8fa98ea
-rw-r--r-- | libxbc/libxbc.c | 2 | ||||
-rw-r--r-- | libxbc/libxbc.h | 2 | ||||
-rw-r--r-- | vts/Android.bp | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/libxbc/libxbc.c b/libxbc/libxbc.c index 6e47dee..d80ac11 100644 --- a/libxbc/libxbc.c +++ b/libxbc/libxbc.c @@ -53,7 +53,7 @@ static bool isTrailerPresent(uint64_t bootconfig_end_addr) { /* * Add a string of boot config parameters to memory appended by the trailer. */ -int32_t addBootConfigParameters(char* params, uint32_t params_size, +int32_t addBootConfigParameters(const char* params, uint32_t params_size, uint64_t bootconfig_start_addr, uint32_t bootconfig_size) { if (!params || !bootconfig_start_addr) { return -1; diff --git a/libxbc/libxbc.h b/libxbc/libxbc.h index 0bee548..7f5b311 100644 --- a/libxbc/libxbc.h +++ b/libxbc/libxbc.h @@ -35,7 +35,7 @@ * @param bootconfig_size size of the current bootconfig section in bytes. * @return number of bytes added to the boot config section. -1 for error. */ -int addBootConfigParameters(char *params, uint32_t params_size, +int addBootConfigParameters(const char *params, uint32_t params_size, uint64_t bootconfig_start_addr, uint32_t bootconfig_size); diff --git a/vts/Android.bp b/vts/Android.bp index 4fb42ef..12caab0 100644 --- a/vts/Android.bp +++ b/vts/Android.bp @@ -22,10 +22,8 @@ cc_test { srcs: [ "VtsBootconfigTest.cpp", ], - shared_libs: [ - "libbase", - "libbpf_android", - ], + header_libs: ["bpf_headers"], + shared_libs: ["libbase"], test_suites: [ "general-tests", "vts", |