Snap for 8730993 from 7b682620be04a41c53ce39c8e9b04490eff4367f to mainline-tzdata3-release
Change-Id: I50161098f35dfb837b2de1eac542c121d72208be
diff --git a/libxbc/libxbc.c b/libxbc/libxbc.c
index d80ac11..6e47dee 100644
--- a/libxbc/libxbc.c
+++ b/libxbc/libxbc.c
@@ -53,7 +53,7 @@
/*
* Add a string of boot config parameters to memory appended by the trailer.
*/
-int32_t addBootConfigParameters(const char* params, uint32_t params_size,
+int32_t addBootConfigParameters(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 7f5b311..0bee548 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(const char *params, uint32_t params_size,
+int addBootConfigParameters(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 12caab0..4fb42ef 100644
--- a/vts/Android.bp
+++ b/vts/Android.bp
@@ -22,8 +22,10 @@
srcs: [
"VtsBootconfigTest.cpp",
],
- header_libs: ["bpf_headers"],
- shared_libs: ["libbase"],
+ shared_libs: [
+ "libbase",
+ "libbpf_android",
+ ],
test_suites: [
"general-tests",
"vts",
