Revert "sm7250-common: Switch to seperate repo for WfdCommon jar"

This reverts commit f85b8c31f5.
2022-03-19 19:51:35 +05:30
parent 2ddaf2d87d
commit a61a2dffe4
3 changed files with 2 additions and 8 deletions
--- a/aosp.dependencies
+++ b/aosp.dependencies
@@ -10,11 +10,5 @@
    "target_path" : "vendor/oneplus/sm7250-common",
    "branch"      : "twelve",
    "remote"      : "pixel-devices-blobs"
-  },
-  {
-    "repository"  : "vendor_oneplus_wfdcommon",
-    "target_path" : "vendor/oneplus/wfdcommon",
-    "branch"      : "lito",
-    "remote"      : "pixel-devices-blobs"
  }
 ]
--- a/common.mk
+++ b/common.mk
@@ -475,8 +475,7 @@ PRODUCT_COPY_FILES += \
 # WiFi Display
 PRODUCT_PACKAGES += \
    libnl \
-    libwfdaac_vendor \
-    WfdCommon
+    libwfdaac_vendor

 PRODUCT_BOOT_JARS += \
    WfdCommon
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -860,6 +860,7 @@ vendor/lib64/libtrustedapploader.so
 vendor/lib64/libwvhidl.so

 # WiFi Display - from LA.UM.9.12.r1-13400.02-SMxx50.QSSI12.0
+system/framework/WfdCommon.jar|9f431b56d7f38c71089333008695dd5f717e5034
 system_ext/bin/wfdservice|2d9bde189325b3faf4e1571543867c6a7e00762d
 system_ext/etc/init/wfdservice.rc|907def8565d8f91f531ca7dfad880af05d540b0c
 system_ext/etc/seccomp_policy/wfdservice.policy|37994de64d6bd127898bd556cd614db459fe07ec