diff options
| author | Alix <agespino@google.com> | 2022-04-21 16:13:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-21 16:13:16 +0000 |
| commit | 0c1c26da6beafe27217ce141ca547e8605dcd733 (patch) | |
| tree | 5a328765e0f54e4678f404369fee6afc23193552 | |
| parent | 9eade27c904aad74a5c05ca4d0614a80302af9b7 (diff) | |
| parent | dedb0956e0f9b92ad561ea1222caee0703e7745e (diff) | |
| download | dynamic_depth-0c1c26da6beafe27217ce141ca547e8605dcd733.tar.gz | |
Fixing merge conflicts am: b3e7a5e887 am: dedb0956e0
Original change: https://android-review.googlesource.com/c/platform/external/dynamic_depth/+/2067882
Change-Id: Ib1ee5e345e8dca96d7e551a3f634e9822758ae0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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: [ |