diff options
author | Alix <agespino@google.com> | 2022-04-19 19:51:51 +0000 |
---|---|---|
committer | Alix <agespino@google.com> | 2022-04-19 20:11:37 +0000 |
commit | b3e7a5e887c54e035cd4f859246c1a4365e4baa1 (patch) | |
tree | 5a328765e0f54e4678f404369fee6afc23193552 | |
parent | ebb9e1a6fe5bcb0141831edb01e1326effbc8273 (diff) | |
download | dynamic_depth-b3e7a5e887c54e035cd4f859246c1a4365e4baa1.tar.gz |
Fixing merge conflicts
Test: treehugger
Change-Id: I80438d19e9b8de648cc3129e9ace2337b56d1c24
-rw-r--r-- | Android.bp | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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: [ |