From 2bbd463d9cebcfc805614472351330912470272d Mon Sep 17 00:00:00 2001 From: Austin Borger Date: Tue, 14 Dec 2021 23:05:01 +0000 Subject: libdynamic_depth: Add host_supported flag to builds. Bug: 207411352 Test: Built libdynamic_depth host build. Change-Id: Ib722fa4a83652da86757ba79913bc4287fa6cf8f --- Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Android.bp b/Android.bp index 94a6488..a88aa9e 100644 --- a/Android.bp +++ b/Android.bp @@ -44,16 +44,19 @@ cc_defaults { 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", -- cgit v1.2.3 From ebb9e1a6fe5bcb0141831edb01e1326effbc8273 Mon Sep 17 00:00:00 2001 From: Alix Date: Mon, 18 Apr 2022 04:09:00 +0000 Subject: Deleted clang property in Android.bp files Deleted deprecated clang property in Android.bp files using bpmodify. Bug: 208980553 Test: treehugger Change-Id: I55c0b4e6d81718e3f7fc3fb7d2c519d2cb3e8cf7 --- Android.bp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Android.bp b/Android.bp index 94a6488..32f87f3 100644 --- a/Android.bp +++ b/Android.bp @@ -1,4 +1,3 @@ - package { default_applicable_licenses: ["external_dynamic_depth_license"], } @@ -28,7 +27,7 @@ cc_defaults { ], rtti: true, cppflags: ["-fno-exceptions"], - clang: true, + sanitize: { misc_undefined: [ "unsigned-integer-overflow", @@ -43,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 { @@ -72,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 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