[automerger skipped] Fixing merge conflicts am: b3e7a5e887 am: dedb0956e0 am: 0c1c26da6b -s ours
am skip reason: skipped by user agespino
Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/2067882
Change-Id: Ib8d80751bcf4a9cf51ab162ce19986af24c37e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 5490f14..a88aa9e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,4 @@
+
package {
default_applicable_licenses: ["external_dynamic_depth_license"],
}
@@ -27,7 +28,7 @@
],
rtti: true,
cppflags: ["-fno-exceptions"],
-
+ clang: true,
sanitize: {
misc_undefined: [
"unsigned-integer-overflow",
@@ -43,16 +44,19 @@
cc_library_headers {
name: "libdynamic_depth-public_headers",
+ host_supported: true,
export_include_dirs: ["includes"],
}
cc_library_headers {
name: "libdynamic_depth-internal_headers",
+ host_supported: true,
export_include_dirs: ["internal"],
}
cc_library {
name: "libdynamic_depth",
+ host_supported: true,
defaults: ["libdynamic_depth-defaults"],
header_libs: [
"libdynamic_depth-public_headers",
