Merge changes from topic "canned_fs_config_sc_mainline_prod" into sc-mainline-prod
* changes:
Merge changes from topic "canned_fs_config" am: ae9cf26353 am: 33fd601118 am: a214351987 am: 7cc9a75156
Merge "Improve handling of errors from zipinfo" am: b02043b84d am: 4b3afb7798 am: 0bbc2d0229 am: ce2624cf88 am: d0cfac1546
diff --git a/bpf/bpf.go b/bpf/bpf.go
index fa1a84d..9f0c86c 100644
--- a/bpf/bpf.go
+++ b/bpf/bpf.go
@@ -83,9 +83,9 @@
// The architecture doesn't matter here, but asm/types.h is included by linux/types.h.
"-isystem bionic/libc/kernel/uapi/asm-arm64",
"-isystem bionic/libc/kernel/android/uapi",
+ "-I frameworks/libs/net/common/native/bpf_headers/include/bpf",
// TODO(b/149785767): only give access to specific file with AID_* constants
"-I system/core/libcutils/include",
- "-I system/bpf/progs/include",
"-I " + ctx.ModuleDir(),
}
diff --git a/scripts/gen_java_usedby_apex.sh b/scripts/gen_java_usedby_apex.sh
index 0cadb1a..e398541 100755
--- a/scripts/gen_java_usedby_apex.sh
+++ b/scripts/gen_java_usedby_apex.sh
@@ -32,7 +32,7 @@
touch "$out"
echo "<externals>" >> "$out"
for x in "$@"; do
- "$dexdeps" "$x" >> "$out" || true
+ "$dexdeps" "$x" >> "$out" || echo "</external>" >> "$out"
done
echo "</externals>" >> "$out"
}