merge in oc-release history after reset to oc-dev
diff --git a/esed/Android.bp b/esed/Android.bp
index 222316d..1c256b6 100644
--- a/esed/Android.bp
+++ b/esed/Android.bp
@@ -18,7 +18,7 @@
cc_defaults {
name: "esed_cflags_defaults",
- proprietary: true,
+ vendor: true,
cflags: [
"-pedantic",
"-Wall",
diff --git a/esed/pn81a/Android.bp b/esed/pn81a/Android.bp
index 20cff0e..a57477b 100644
--- a/esed/pn81a/Android.bp
+++ b/esed/pn81a/Android.bp
@@ -18,6 +18,7 @@
cc_library_static {
name: "esed_pn81a_apdu",
+ vendor: true,
srcs: [
"apdu.cpp",
],
@@ -26,6 +27,7 @@
cc_library_shared {
name: "esed_pn81a",
+ vendor: true,
srcs: [
"pn81a.cpp",
],
diff --git a/esed/pn81a/tests/Android.bp b/esed/pn81a/tests/Android.bp
index 7a2d5ae..ae08298 100644
--- a/esed/pn81a/tests/Android.bp
+++ b/esed/pn81a/tests/Android.bp
@@ -16,6 +16,7 @@
cc_test {
name: "esed_pn81a_apdu_test",
+ vendor: true,
srcs: [
"apdu_test.cpp",
],
diff --git a/examples/Android.bp b/examples/Android.bp
index 1678ba0..5cb41d6 100644
--- a/examples/Android.bp
+++ b/examples/Android.bp
@@ -16,6 +16,7 @@
cc_binary {
name: "ese_nxp_sample",
+ vendor: true,
srcs: ["ese_nxp_sample.c"],
host_supported: false,
target: {
diff --git a/libese-hw/Android.bp b/libese-hw/Android.bp
index 7cd8ac4..2002232 100644
--- a/libese-hw/Android.bp
+++ b/libese-hw/Android.bp
@@ -16,6 +16,7 @@
cc_library {
name: "libese-hw-fake",
+ vendor: true,
srcs: ["ese_hw_fake.c"],
host_supported: true,
cflags: ["-DLOG_NDEBUG=0", "-std=c99"],
@@ -24,6 +25,7 @@
cc_library {
name: "libese-hw-echo",
+ vendor: true,
host_supported: true,
srcs: ["ese_hw_echo.c"],
cflags: ["-DLOG_NDEBUG=0", "-std=c99"],
diff --git a/libese-hw/nxp/Android.bp b/libese-hw/nxp/Android.bp
index 0e0208e..5c8c786 100644
--- a/libese-hw/nxp/Android.bp
+++ b/libese-hw/nxp/Android.bp
@@ -16,6 +16,7 @@
cc_library {
name: "libese-hw-nxp-pn80t-common",
+ vendor: true,
debug: {
cflags: ["-DLOG_NDEBUG=0"],
},
@@ -32,6 +33,7 @@
cc_defaults {
name: "pn80t_platform",
+ vendor: true,
target: {
darwin: {
enabled: false,
@@ -46,12 +48,14 @@
cc_library {
name: "libese-hw-nxp-pn80t-spidev",
+ vendor: true,
defaults: ["pn80t_platform"],
srcs: ["pn80t/linux_spidev.c"],
}
cc_library {
name: "libese-hw-nxp-pn80t-nq-nci",
+ vendor: true,
defaults: ["pn80t_platform"],
srcs: ["pn80t/nq_nci.c"],
}
diff --git a/libese-hw/tests/Android.bp b/libese-hw/tests/Android.bp
index 75aaf21..0ca25e0 100644
--- a/libese-hw/tests/Android.bp
+++ b/libese-hw/tests/Android.bp
@@ -16,8 +16,9 @@
cc_test {
name: "ese_hw_tests",
- srcs: ["ese_hw_echo_tests.cpp"],
+ vendor: true,
host_supported: true,
+ srcs: ["ese_hw_echo_tests.cpp"],
shared_libs: [
"libese",
"libese-teq1",
diff --git a/libese-sysdeps/Android.bp b/libese-sysdeps/Android.bp
index b9b412a..7723197 100644
--- a/libese-sysdeps/Android.bp
+++ b/libese-sysdeps/Android.bp
@@ -16,6 +16,7 @@
cc_library {
name: "libese-sysdeps",
+ vendor_available: true,
host_supported: true,
srcs: [],
local_include_dirs: [
diff --git a/libese-teq1/Android.bp b/libese-teq1/Android.bp
index 76454f4..01a06af 100644
--- a/libese-teq1/Android.bp
+++ b/libese-teq1/Android.bp
@@ -16,6 +16,7 @@
cc_library {
name: "libese-teq1",
+ vendor: true,
host_supported: true,
srcs: ["teq1.c"],
@@ -33,6 +34,7 @@
cc_library {
name: "libese-teq1-private",
+ vendor: true,
host_supported: true,
srcs: ["teq1.c"],
diff --git a/libese-teq1/tests/Android.bp b/libese-teq1/tests/Android.bp
index a54a0af..4fdfd23 100644
--- a/libese-teq1/tests/Android.bp
+++ b/libese-teq1/tests/Android.bp
@@ -16,8 +16,9 @@
cc_test {
name: "ese_teq1_unittests",
- srcs: ["teq1_unittests.cpp"],
+ vendor: true,
host_supported: true,
+ srcs: ["teq1_unittests.cpp"],
shared_libs: [
"libese",
"libese-teq1-private",
diff --git a/libese/Android.bp b/libese/Android.bp
index 411001c..4e6c201 100644
--- a/libese/Android.bp
+++ b/libese/Android.bp
@@ -16,6 +16,7 @@
cc_library {
name: "libese",
+ vendor: true,
host_supported: true,
srcs: [
diff --git a/libese/tests/Android.bp b/libese/tests/Android.bp
index 1239eb2..7d032c5 100644
--- a/libese/tests/Android.bp
+++ b/libese/tests/Android.bp
@@ -16,8 +16,9 @@
cc_test {
name: "ese_unittests",
- srcs: ["ese_unittests.cpp", "bitspec_unittests.cpp"],
+ vendor: true,
host_supported: true,
+ srcs: ["ese_unittests.cpp", "bitspec_unittests.cpp"],
shared_libs: [
"libese",
"libese-hw-fake",
diff --git a/tools/ese_relay/Android.bp b/tools/ese_relay/Android.bp
index 329dabe..bca167c 100644
--- a/tools/ese_relay/Android.bp
+++ b/tools/ese_relay/Android.bp
@@ -16,6 +16,7 @@
cc_defaults {
name: "ese-relay-defaults",
+ vendor: true,
host_supported: false,
target: {
darwin: {
@@ -31,6 +32,7 @@
cc_binary {
name: "ese-relay-pn80t-nq-nci",
+ vendor: true,
defaults: ["ese-relay-defaults"],
srcs: ["ese_relay_pn80t_nq_nci.c"],
shared_libs: ["libese-hw-nxp-pn80t-nq-nci", "libese-teq1"],
@@ -38,6 +40,7 @@
cc_binary {
name: "ese-relay-pn80t-spidev",
+ vendor: true,
defaults: ["ese-relay-defaults"],
srcs: ["ese_relay_pn80t_spidev.c"],
shared_libs: ["libese-hw-nxp-pn80t-spidev", "libese-teq1"],
@@ -45,6 +48,7 @@
cc_binary {
name: "ese-relay-fake",
+ vendor: true,
defaults: ["ese-relay-defaults"],
srcs: ["ese_relay_fake.c"],
shared_libs: ["libese-hw-fake"],
