diff --git a/sensors/2.0/multihal/Android.bp b/sensors/2.0/multihal/Android.bp index b7fa15a3df..7213b448b4 100644 --- a/sensors/2.0/multihal/Android.bp +++ b/sensors/2.0/multihal/Android.bp @@ -13,14 +13,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -cc_defaults { - name: "android.hardware.sensors@2.0-multihal-defaults", - header_libs: [ - "android.hardware.sensors@2.0-multihal.header", +cc_binary { + name: "android.hardware.sensors@2.0-service.multihal", + defaults: [ + "hidl_defaults", ], + vendor: true, + relative_install_path: "hw", + srcs: [ + "service.cpp", + ], + init_rc: ["android.hardware.sensors@2.0-service-multihal.rc"], + vintf_fragments: ["android.hardware.sensors@2.0-multihal.xml"], shared_libs: [ - "android.hardware.sensors@1.0", "android.hardware.sensors@2.0", + "android.hardware.sensors@2.0-ScopedWakelock", "libbase", "libcutils", "libfmq", @@ -29,81 +36,5 @@ cc_defaults { "libpower", "libutils", ], - cflags: ["-DLOG_TAG=\"SensorsMultiHal\""], -} - -cc_binary { - name: "android.hardware.sensors@2.0-service.multihal", - defaults: [ - "hidl_defaults", - "android.hardware.sensors@2.0-multihal-defaults", - ], - vendor: true, - relative_install_path: "hw", - srcs: [ - "service.cpp", - "HalProxy.cpp", - ], - init_rc: ["android.hardware.sensors@2.0-service-multihal.rc"], - vintf_fragments: ["android.hardware.sensors@2.0-multihal.xml"], - shared_libs: ["android.hardware.sensors@2.0-ScopedWakelock"], -} - -cc_library_headers { - name: "android.hardware.sensors@2.0-multihal.header", - vendor_available: true, - export_include_dirs: ["include"], -} - -cc_library_shared { - name: "android.hardware.sensors@2.0-ScopedWakelock", - defaults: [ - "hidl_defaults", - "android.hardware.sensors@2.0-multihal-defaults", - ], - srcs: [ - "ScopedWakelock.cpp", - ], - vendor_available: true, - export_header_lib_headers: [ - "android.hardware.sensors@2.0-multihal.header", - ], -} - -// The below targets should only be used for testing. -cc_test_library { - name: "android.hardware.sensors@2.0-HalProxy", - defaults: [ - "hidl_defaults", - "android.hardware.sensors@2.0-multihal-defaults", - ], - vendor_available: true, - srcs: [ - "HalProxy.cpp", - ], - export_header_lib_headers: [ - "android.hardware.sensors@2.0-multihal.header", - ], - export_shared_lib_headers: [ - "android.hardware.sensors@2.0-ScopedWakelock", - ], - shared_libs: [ - "libutils", - "android.hardware.sensors@2.0-ScopedWakelock", - ], -} - -cc_test_library { - name: "android.hardware.sensors@2.0-ScopedWakelock.testlib", - defaults: [ - "hidl_defaults", - "android.hardware.sensors@2.0-multihal-defaults", - ], - srcs: [ - "ScopedWakelock.cpp", - ], - vendor_available: true, - export_header_lib_headers: [ - "android.hardware.sensors@2.0-multihal.header", - ], + static_libs: ["android.hardware.sensors@2.X-multihal"], } diff --git a/sensors/common/default/2.X/multihal/Android.bp b/sensors/common/default/2.X/multihal/Android.bp new file mode 100644 index 0000000000..2b4b3bfffa --- /dev/null +++ b/sensors/common/default/2.X/multihal/Android.bp @@ -0,0 +1,84 @@ +// +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +cc_defaults { + name: "android.hardware.sensors@2.X-multihal-defaults", + header_libs: [ + "android.hardware.sensors@2.0-multihal.header", + ], + shared_libs: [ + "android.hardware.sensors@1.0", + "android.hardware.sensors@2.0", + "libbase", + "libcutils", + "libfmq", + "libhidlbase", + "liblog", + "libpower", + "libutils", + ], + cflags: ["-DLOG_TAG=\"SensorsMultiHal\""], +} + +cc_library_headers { + name: "android.hardware.sensors@2.0-multihal.header", + vendor_available: true, + export_include_dirs: ["include"], +} + +cc_library_static { + name: "android.hardware.sensors@2.X-multihal", + defaults: [ + "hidl_defaults", + "android.hardware.sensors@2.X-multihal-defaults", + ], + srcs: [ + "HalProxy.cpp", + ], + vendor_available: true, + export_header_lib_headers: [ + "android.hardware.sensors@2.0-multihal.header", + ], +} + +cc_library_shared { + name: "android.hardware.sensors@2.0-ScopedWakelock", + defaults: [ + "hidl_defaults", + "android.hardware.sensors@2.X-multihal-defaults", + ], + srcs: [ + "ScopedWakelock.cpp", + ], + vendor_available: true, + export_header_lib_headers: [ + "android.hardware.sensors@2.0-multihal.header", + ], +} + +cc_test_library { + name: "android.hardware.sensors@2.0-ScopedWakelock.testlib", + defaults: [ + "hidl_defaults", + "android.hardware.sensors@2.X-multihal-defaults", + ], + srcs: [ + "ScopedWakelock.cpp", + ], + vendor_available: true, + export_header_lib_headers: [ + "android.hardware.sensors@2.0-multihal.header", + ], +} diff --git a/sensors/2.0/multihal/HalProxy.cpp b/sensors/common/default/2.X/multihal/HalProxy.cpp similarity index 100% rename from sensors/2.0/multihal/HalProxy.cpp rename to sensors/common/default/2.X/multihal/HalProxy.cpp diff --git a/sensors/2.0/multihal/ScopedWakelock.cpp b/sensors/common/default/2.X/multihal/ScopedWakelock.cpp similarity index 100% rename from sensors/2.0/multihal/ScopedWakelock.cpp rename to sensors/common/default/2.X/multihal/ScopedWakelock.cpp diff --git a/sensors/2.0/multihal/include/HalProxy.h b/sensors/common/default/2.X/multihal/include/HalProxy.h similarity index 100% rename from sensors/2.0/multihal/include/HalProxy.h rename to sensors/common/default/2.X/multihal/include/HalProxy.h diff --git a/sensors/2.0/multihal/include/ScopedWakelock.h b/sensors/common/default/2.X/multihal/include/ScopedWakelock.h similarity index 100% rename from sensors/2.0/multihal/include/ScopedWakelock.h rename to sensors/common/default/2.X/multihal/include/ScopedWakelock.h diff --git a/sensors/2.0/multihal/include/SubHal.h b/sensors/common/default/2.X/multihal/include/SubHal.h similarity index 100% rename from sensors/2.0/multihal/include/SubHal.h rename to sensors/common/default/2.X/multihal/include/SubHal.h diff --git a/sensors/2.0/multihal/tests/Android.bp b/sensors/common/default/2.X/multihal/tests/Android.bp similarity index 77% rename from sensors/2.0/multihal/tests/Android.bp rename to sensors/common/default/2.X/multihal/tests/Android.bp index 472f3f3509..afb63cc22f 100644 --- a/sensors/2.0/multihal/tests/Android.bp +++ b/sensors/common/default/2.X/multihal/tests/Android.bp @@ -14,7 +14,7 @@ // limitations under the License. cc_defaults { - name: "android.hardware.sensors@2.0-fakesubhal-defaults", + name: "android.hardware.sensors@2.X-fakesubhal-defaults", srcs: [ "fake_subhal/*.cpp", ], @@ -35,7 +35,7 @@ cc_defaults { "libutils", ], static_libs: [ - "android.hardware.sensors@2.0-HalProxy", + "android.hardware.sensors@2.X-multihal", ], cflags: [ "-DLOG_TAG=\"FakeSubHal\"", @@ -43,9 +43,9 @@ cc_defaults { } cc_library { - name: "android.hardware.sensors@2.0-fakesubhal-config1", + name: "android.hardware.sensors@2.X-fakesubhal-config1", vendor: true, - defaults: ["android.hardware.sensors@2.0-fakesubhal-defaults"], + defaults: ["android.hardware.sensors@2.X-fakesubhal-defaults"], cflags: [ "-DSUPPORT_CONTINUOUS_SENSORS", "-DSUB_HAL_NAME=\"FakeSubHal-Continuous\"", @@ -53,9 +53,9 @@ cc_library { } cc_library { - name: "android.hardware.sensors@2.0-fakesubhal-config2", + name: "android.hardware.sensors@2.X-fakesubhal-config2", vendor: true, - defaults: ["android.hardware.sensors@2.0-fakesubhal-defaults"], + defaults: ["android.hardware.sensors@2.X-fakesubhal-defaults"], cflags: [ "-DSUPPORT_ON_CHANGE_SENSORS", "-DSUB_HAL_NAME=\"FakeSubHal-OnChange\"", @@ -63,9 +63,9 @@ cc_library { } cc_test_library { - name: "android.hardware.sensors@2.0-fakesubhal-unittest", + name: "android.hardware.sensors@2.X-fakesubhal-unittest", vendor_available: true, - defaults: ["android.hardware.sensors@2.0-fakesubhal-defaults"], + defaults: ["android.hardware.sensors@2.X-fakesubhal-defaults"], cflags: [ "-DSUPPORT_ON_CHANGE_SENSORS", "-DSUPPORT_CONTINUOUS_SENSORS", @@ -74,13 +74,13 @@ cc_test_library { } cc_test { - name: "android.hardware.sensors@2.0-halproxy-unit-tests", + name: "android.hardware.sensors@2.X-halproxy-unit-tests", srcs: ["HalProxy_test.cpp"], vendor: true, static_libs: [ - "android.hardware.sensors@2.0-HalProxy", - "android.hardware.sensors@2.0-fakesubhal-unittest", "android.hardware.sensors@2.0-ScopedWakelock.testlib", + "android.hardware.sensors@2.X-multihal", + "android.hardware.sensors@2.X-fakesubhal-unittest", ], shared_libs: [ "android.hardware.sensors@1.0", diff --git a/sensors/2.0/multihal/tests/HalProxy_test.cpp b/sensors/common/default/2.X/multihal/tests/HalProxy_test.cpp similarity index 100% rename from sensors/2.0/multihal/tests/HalProxy_test.cpp rename to sensors/common/default/2.X/multihal/tests/HalProxy_test.cpp diff --git a/sensors/2.0/multihal/tests/fake_subhal/README b/sensors/common/default/2.X/multihal/tests/fake_subhal/README similarity index 100% rename from sensors/2.0/multihal/tests/fake_subhal/README rename to sensors/common/default/2.X/multihal/tests/fake_subhal/README diff --git a/sensors/2.0/multihal/tests/fake_subhal/Sensor.cpp b/sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.cpp similarity index 100% rename from sensors/2.0/multihal/tests/fake_subhal/Sensor.cpp rename to sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.cpp diff --git a/sensors/2.0/multihal/tests/fake_subhal/Sensor.h b/sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.h similarity index 100% rename from sensors/2.0/multihal/tests/fake_subhal/Sensor.h rename to sensors/common/default/2.X/multihal/tests/fake_subhal/Sensor.h diff --git a/sensors/2.0/multihal/tests/fake_subhal/SensorsSubHal.cpp b/sensors/common/default/2.X/multihal/tests/fake_subhal/SensorsSubHal.cpp similarity index 100% rename from sensors/2.0/multihal/tests/fake_subhal/SensorsSubHal.cpp rename to sensors/common/default/2.X/multihal/tests/fake_subhal/SensorsSubHal.cpp diff --git a/sensors/2.0/multihal/tests/fake_subhal/SensorsSubHal.h b/sensors/common/default/2.X/multihal/tests/fake_subhal/SensorsSubHal.h similarity index 100% rename from sensors/2.0/multihal/tests/fake_subhal/SensorsSubHal.h rename to sensors/common/default/2.X/multihal/tests/fake_subhal/SensorsSubHal.h