sdm845-common: Relocate dashd to /system/bin

Change-Id: Ief585959ebef9461bd62b26039997ae3c438c1d5
OP3Treble · Apr 2, 2020 · 0d0cb33 · 0d0cb33
1 parent de81be5
commit 0d0cb33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/sdm845-common/Android.mk b/sdm845-common/Android.mk
@@ -18,14 +18,4 @@ LOCAL_PATH := $(call my-dir)
 
 ifneq ($(filter enchilada fajita,$(TARGET_DEVICE)),)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := dashd
-LOCAL_MODULE_OWNER := oneplus
-LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
-LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
-LOCAL_SRC_FILES := proprietary/rootfs/sbin/dashd
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := EXECUTABLES
-include $(BUILD_PREBUILT)
-
 endif
diff --git a/sdm845-common/proprietary/rootfs/sbin/dashd → sdm845-common/proprietary/bin/dashd b/sdm845-common/proprietary/rootfs/sbin/dashd → sdm845-common/proprietary/bin/dashd
diff --git a/sdm845-common/sdm845-common-vendor.mk b/sdm845-common/sdm845-common-vendor.mk
@@ -109,7 +109,8 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/sdm845-common/proprietary/product/lib64/libdpmtcm.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libdpmtcm.so \
     vendor/oneplus/sdm845-common/proprietary/product/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libimscamera_jni.so \
     vendor/oneplus/sdm845-common/proprietary/product/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libimsmedia_jni.so \
-    vendor/oneplus/sdm845-common/proprietary/product/lib64/[email protected]:$(TARGET_COPY_OUT_PRODUCT)/lib64/[email protected]
+    vendor/oneplus/sdm845-common/proprietary/product/lib64/[email protected]:$(TARGET_COPY_OUT_PRODUCT)/lib64/[email protected] \
+    vendor/oneplus/sdm845-common/proprietary/bin/dashd:$(TARGET_COPY_OUT_SYSTEM)/bin/dashd
 
 PRODUCT_PACKAGES += \
     libantradio \
@@ -123,5 +124,4 @@ PRODUCT_PACKAGES += \
     ims \
     qcrilmsgtunnel \
     WfdCommon \
-    qcnvitems \
-    dashd
+    qcnvitems