Update after Android build file defaults refactor
Change-Id: I60d81c28946847f001a4f75bb56c9d7306a1a4fb
diff --git a/Android.bp b/Android.bp
index deb53ac..bfbcdf7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,7 +16,7 @@
cc_library_headers {
name: "nos_headers",
- defaults: ["nos_shared_cc_defaults"],
+ defaults: ["nos_cc_host_supported_defaults"],
export_include_dirs: ["nugget/include"],
}
@@ -42,7 +42,7 @@
name: "nos_app_service_defaults",
defaults: [
"nos_app_defaults",
- "nos_base_cc_defaults",
+ "nos_cc_defaults",
],
shared_libs: ["libnosprotos"],
export_shared_lib_headers: ["libnosprotos"],
diff --git a/citadel/updater/Android.bp b/citadel/updater/Android.bp
index 746d92f..8ea42a4 100644
--- a/citadel/updater/Android.bp
+++ b/citadel/updater/Android.bp
@@ -19,7 +19,7 @@
srcs: [
"updater.cpp"
],
- defaults: ["nos_cc_defaults"],
+ defaults: ["nos_cc_hw_defaults"],
cflags: [
// for openssl/sha.h
"-Wno-gnu-anonymous-struct",
diff --git a/libnos/Android.bp b/libnos/Android.bp
index f813847..49c5385 100644
--- a/libnos/Android.bp
+++ b/libnos/Android.bp
@@ -19,7 +19,7 @@
srcs: [
"debug.cpp",
],
- defaults: ["nos_shared_cc_defaults"],
+ defaults: ["nos_cc_host_supported_defaults"],
header_libs: ["nos_headers"],
shared_libs: ["libnos_datagram"],
export_include_dirs: ["include"],
diff --git a/libnos/generator/Android.bp b/libnos/generator/Android.bp
index 32839d9..4ff1606 100644
--- a/libnos/generator/Android.bp
+++ b/libnos/generator/Android.bp
@@ -19,7 +19,7 @@
srcs: ["main.cpp"],
defaults: [
"nos_proto_defaults",
- "nos_base_cc_defaults",
+ "nos_cc_defaults",
],
static_libs: ["libnosprotos"],
shared_libs: ["libprotoc"],
diff --git a/libnos/test/Android.bp b/libnos/test/Android.bp
index 2a3654a..0a06894 100644
--- a/libnos/test/Android.bp
+++ b/libnos/test/Android.bp
@@ -16,7 +16,7 @@
cc_test_library {
name: "libnos_mock",
- defaults: ["nos_shared_cc_defaults"],
+ defaults: ["nos_cc_host_supported_defaults"],
shared_libs: ["libnos"],
export_include_dirs: ["include"],
export_shared_lib_headers: ["libnos"],
diff --git a/libnos_datagram/Android.bp b/libnos_datagram/Android.bp
index 9f4a1c9..15d49d3 100644
--- a/libnos_datagram/Android.bp
+++ b/libnos_datagram/Android.bp
@@ -16,6 +16,6 @@
cc_library {
name: "libnos_datagram",
- defaults: ["nos_shared_cc_defaults"],
+ defaults: ["nos_cc_host_supported_defaults"],
export_include_dirs: ["include"],
}
diff --git a/libnos_transport/Android.bp b/libnos_transport/Android.bp
index 7ddeed4..9e4703e 100644
--- a/libnos_transport/Android.bp
+++ b/libnos_transport/Android.bp
@@ -19,7 +19,7 @@
srcs: [
"transport.c",
],
- defaults: ["nos_shared_cc_defaults"],
+ defaults: ["nos_cc_host_supported_defaults"],
cflags: [
"-Wno-zero-length-array",
],
diff --git a/nugget/proto/Android.bp b/nugget/proto/Android.bp
index 7cea715..4a785ba 100644
--- a/nugget/proto/Android.bp
+++ b/nugget/proto/Android.bp
@@ -42,7 +42,7 @@
exclude_srcs: ["google/protobuf/descriptor.proto"], // Used for bazel build
defaults: [
"libnosprotos_defaults",
- "nos_shared_cc_defaults",
+ "nos_cc_host_supported_defaults",
],
proto: {
type: "full",