Revert "Move hals.conf into prebuilt_etc"
This reverts commit 2f973f78947e0ebab9f7e6801f7c0f20fc95b827.
Bug: 157223866
Reason for revert: Broken build on git_qt-qpr1-dev-plus-aosp on build_test
Change-Id: I9219c39ec033b641655c30f6684e0806ccece02d
diff --git a/sensors/Android.bp b/sensors/Android.bp
index 291f025..f6040f0 100644
--- a/sensors/Android.bp
+++ b/sensors/Android.bp
@@ -14,14 +14,6 @@
* limitations under the License.
*/
-prebuilt_etc {
- name: "android.hardware.sensors@2.1-impl.ranchu.etc",
- vendor: true,
- sub_dir: "sensors",
- filename: "hals.conf",
- src: "hals.conf"
-}
-
cc_library_shared {
name: "android.hardware.sensors@2.1-impl.ranchu",
vendor: true,
@@ -49,5 +41,4 @@
"-DLOG_TAG=\"android.hardware.sensors@2.1-impl.ranchu\"",
"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",
],
- required: ["android.hardware.sensors@2.1-impl.ranchu.etc"],
}
diff --git a/vendor.mk b/vendor.mk
index b2df280..57fa76f 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -111,6 +111,12 @@
PRODUCT_PACKAGES += \
android.hardware.sensors@2.1-service.multihal \
android.hardware.sensors@2.1-impl.ranchu
+# TODO(rkir):
+# add a soong namespace and move this into a.h.sensors@2.1-impl.ranchu
+# as prebuilt_etc. For now soong_namespace causes a build break because the fw
+# refers to our wifi HAL in random places.
+PRODUCT_COPY_FILES += \
+ device/generic/goldfish/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
endif
PRODUCT_PACKAGES += \
