Merge "Rename VehicleHalUtils to VehicleHalUtilsVendor."

2022-02-01 04:39:14 +00:00 · 2022-02-01 04:39:14 +00:00 · 51ded99b43
commit 51ded99b43
parent 1badef4402 b819484c47
16 changed files with 51 additions and 24 deletions
--- a/automotive/vehicle/aidl/aidl_test/Android.bp
+++ b/automotive/vehicle/aidl/aidl_test/Android.bp
@ -26,7 +26,7 @@ cc_test {
        "libhidlbase",
    ],
    static_libs: [
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
        "android.hardware.automotive.vehicle@2.0",
        "libgtest",
        "libgmock",
--- a/automotive/vehicle/aidl/impl/default_config/Android.bp
+++ b/automotive/vehicle/aidl/impl/default_config/Android.bp
@ -24,8 +24,8 @@ cc_library_headers {
    local_include_dirs: ["include"],
    export_include_dirs: ["include"],
    defaults: ["VehicleHalDefaults"],
-    static_libs: ["VehicleHalUtils"],
+    static_libs: ["VehicleHalUtilsVendor"],
    header_libs: ["VehicleHalTestUtilHeaders"],
-    export_static_lib_headers: ["VehicleHalUtils"],
+    export_static_lib_headers: ["VehicleHalUtilsVendor"],
    export_header_lib_headers: ["VehicleHalTestUtilHeaders"],
 }
--- a/automotive/vehicle/aidl/impl/default_config/test/Android.bp
+++ b/automotive/vehicle/aidl/impl/default_config/test/Android.bp
@ -24,7 +24,7 @@ cc_test {
    defaults: ["VehicleHalDefaults"],
    srcs: ["*.cpp"],
    static_libs: [
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
        "libgtest",
    ],
    header_libs: [
--- a/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/Android.bp
+++ b/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/Android.bp
@ -26,7 +26,7 @@ cc_library {
    export_include_dirs: ["include"],
    defaults: ["VehicleHalDefaults"],
    static_libs: [
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
        "FakeObd2Frame",
    ],
    shared_libs: [
--- a/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/test/Android.bp
+++ b/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/test/Android.bp
@ -24,7 +24,7 @@ cc_test {
    srcs: ["*.cpp"],
    defaults: ["VehicleHalDefaults"],
    static_libs: [
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
        "FakeVehicleHalValueGenerators",
        "FakeObd2Frame",
    ],
--- a/automotive/vehicle/aidl/impl/fake_impl/hardware/Android.bp
+++ b/automotive/vehicle/aidl/impl/fake_impl/hardware/Android.bp
@ -39,7 +39,7 @@ cc_defaults {
    ],
    export_header_lib_headers: ["IVehicleHardware"],
    static_libs: [
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
        "FakeVehicleHalValueGenerators",
        "FakeObd2Frame",
        "FakeUserHal",
@ -47,5 +47,5 @@ cc_defaults {
    shared_libs: [
        "libjsoncpp",
    ],
-    export_static_lib_headers: ["VehicleHalUtils"],
+    export_static_lib_headers: ["VehicleHalUtilsVendor"],
 }
--- a/automotive/vehicle/aidl/impl/fake_impl/hardware/test/Android.bp
+++ b/automotive/vehicle/aidl/impl/fake_impl/hardware/test/Android.bp
@ -29,7 +29,7 @@ cc_test {
        "VehicleHalTestUtilHeaders",
    ],
    static_libs: [
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
        "FakeVehicleHardware",
        "FakeVehicleHalValueGenerators",
        "FakeObd2Frame",
--- a/automotive/vehicle/aidl/impl/fake_impl/obd2frame/Android.bp
+++ b/automotive/vehicle/aidl/impl/fake_impl/obd2frame/Android.bp
@ -26,7 +26,7 @@ cc_library {
    export_include_dirs: ["include"],
    defaults: ["VehicleHalDefaults"],
    static_libs: [
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
    ],
-    export_static_lib_headers: ["VehicleHalUtils"],
+    export_static_lib_headers: ["VehicleHalUtilsVendor"],
 }
--- a/automotive/vehicle/aidl/impl/fake_impl/obd2frame/test/Android.bp
+++ b/automotive/vehicle/aidl/impl/fake_impl/obd2frame/test/Android.bp
@ -25,7 +25,7 @@ cc_test {
    defaults: ["VehicleHalDefaults"],
    static_libs: [
        "FakeObd2Frame",
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
    ],
    test_suites: ["device-tests"],
 }
--- a/automotive/vehicle/aidl/impl/fake_impl/userhal/Android.bp
+++ b/automotive/vehicle/aidl/impl/fake_impl/userhal/Android.bp
@ -26,7 +26,7 @@ cc_library {
    export_include_dirs: ["include"],
    defaults: ["VehicleHalDefaults"],
    static_libs: [
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
    ],
-    export_static_lib_headers: ["VehicleHalUtils"],
+    export_static_lib_headers: ["VehicleHalUtilsVendor"],
 }
--- a/automotive/vehicle/aidl/impl/fake_impl/userhal/test/Android.bp
+++ b/automotive/vehicle/aidl/impl/fake_impl/userhal/test/Android.bp
@ -25,7 +25,7 @@ cc_test {
    defaults: ["VehicleHalDefaults"],
    static_libs: [
        "FakeUserHal",
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
        "libgtest",
        "libgmock",
    ],
--- a/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/Android.bp
+++ b/automotive/vehicle/aidl/impl/grpc/utils/proto_message_converter/Android.bp
@ -34,10 +34,10 @@ cc_library {
    shared_libs: ["libprotobuf-cpp-full"],
    static_libs: [
        "VehicleHalProtos",
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
    ],
    defaults: ["VehicleHalDefaults"],
-    export_static_lib_headers: ["VehicleHalUtils"],
+    export_static_lib_headers: ["VehicleHalUtilsVendor"],
 }

 cc_test {
@ -51,7 +51,7 @@ cc_test {
    static_libs: [
        "VehicleHalProtoMessageConverter",
        "VehicleHalProtos",
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
        "libgtest",
    ],
    header_libs: ["VehicleHalDefaultConfig"],
--- a/automotive/vehicle/aidl/impl/utils/common/Android.bp
+++ b/automotive/vehicle/aidl/impl/utils/common/Android.bp
@ -19,7 +19,7 @@ package {
 }

 cc_library {
-    name: "VehicleHalUtils",
+    name: "VehicleHalUtilsVendor",
    srcs: ["src/*.cpp"],
    vendor: true,
    local_include_dirs: ["include"],
@ -27,6 +27,33 @@ cc_library {
    defaults: ["VehicleHalDefaults"],
 }

+// This is a non-vendor version for VehicleHalUtilsVendor.
+cc_library {
+    name: "VehicleHalUtils",
+    srcs: ["src/*.cpp"],
+    local_include_dirs: ["include"],
+    export_include_dirs: ["include"],
+    static_libs: [
+        "android-automotive-large-parcelable-lib",
+        "android.hardware.automotive.vehicle-V1-ndk",
+        "libmath",
+    ],
+    shared_libs: [
+        "libbase",
+        "liblog",
+        "libutils",
+    ],
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+        "-Wthread-safety",
+    ],
+    defaults: [
+        "android-automotive-large-parcelable-defaults",
+    ],
+}
+
 cc_library_headers {
    name: "VehicleHalUtilHeaders",
    export_include_dirs: ["include"],
--- a/automotive/vehicle/aidl/impl/utils/common/test/Android.bp
+++ b/automotive/vehicle/aidl/impl/utils/common/test/Android.bp
@ -19,11 +19,11 @@ package {
 }

 cc_test {
-    name: "VehicleHalVehicleUtilsTest",
+    name: "VehicleHalVehicleUtilsVendorTest",
    srcs: ["*.cpp"],
    vendor: true,
    static_libs: [
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
        "libgtest",
        "libgmock",
    ],
--- a/automotive/vehicle/aidl/impl/vhal/Android.bp
+++ b/automotive/vehicle/aidl/impl/vhal/Android.bp
@ -33,7 +33,7 @@ cc_binary {
    static_libs: [
        "DefaultVehicleHal",
        "FakeVehicleHardware",
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
    ],
    header_libs: [
        "IVehicleHardware",
@ -58,7 +58,7 @@ cc_library {
        "src/SubscriptionManager.cpp",
    ],
    static_libs: [
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
    ],
    header_libs: [
        "IVehicleHardware",
--- a/automotive/vehicle/aidl/impl/vhal/test/Android.bp
+++ b/automotive/vehicle/aidl/impl/vhal/test/Android.bp
@ -24,7 +24,7 @@ cc_test {
    srcs: ["*.cpp"],
    static_libs: [
        "DefaultVehicleHal",
-        "VehicleHalUtils",
+        "VehicleHalUtilsVendor",
        "libgtest",
        "libgmock",
    ],