From b3e7a5e887c54e035cd4f859246c1a4365e4baa1 Mon Sep 17 00:00:00 2001 From: Alix Date: Tue, 19 Apr 2022 19:51:51 +0000 Subject: Fixing merge conflicts Test: treehugger Change-Id: I80438d19e9b8de648cc3129e9ace2337b56d1c24 --- Android.bp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Android.bp b/Android.bp index 32f87f3..5490f14 100644 --- a/Android.bp +++ b/Android.bp @@ -27,7 +27,7 @@ cc_defaults { ], rtti: true, cppflags: ["-fno-exceptions"], - + sanitize: { misc_undefined: [ "unsigned-integer-overflow", @@ -42,13 +42,13 @@ cc_defaults { } cc_library_headers { - name: "libdynamic_depth-public_headers", - export_include_dirs: ["includes"], + name: "libdynamic_depth-public_headers", + export_include_dirs: ["includes"], } cc_library_headers { - name: "libdynamic_depth-internal_headers", - export_include_dirs: ["internal"], + name: "libdynamic_depth-internal_headers", + export_include_dirs: ["internal"], } cc_library { @@ -71,7 +71,7 @@ cc_library_static { defaults: ["libdynamic_depth-defaults"], export_include_dirs: [ "includes", - "internal", + "internal" ], srcs: ["internal/**/*.cc"], shared_libs: [ -- cgit v1.2.3