diff --git a/galaxys2-common/common-vendor-blobs.mk b/galaxys2-common/common-vendor-blobs.mk index da1eaac..3053792 100644 --- a/galaxys2-common/common-vendor-blobs.mk +++ b/galaxys2-common/common-vendor-blobs.mk @@ -15,16 +15,15 @@ LOCAL_PATH := vendor/samsung/galaxys2-common PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/proprietary/system/bin/bcm4330B1.hcd:system/bin/bcm4330B1.hcd \ - $(LOCAL_PATH)/proprietary/system/bin/bcm4330B1_murata.hcd:system/bin/bcm4330B1_murata.hcd \ - $(LOCAL_PATH)/proprietary/system/bin/bcm4330B1_semcosh.hcd:system/bin/bcm4330B1_semcosh.hcd \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_apsta.bin:system/etc/wifi/bcmdhd_apsta.bin \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_mfg.bin:system/etc/wifi/bcmdhd_mfg.bin \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_p2p.bin:system/etc/wifi/bcmdhd_p2p.bin \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/bcmdhd_sta.bin:system/etc/wifi/bcmdhd_sta.bin \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_mfg.txt:system/etc/wifi/nvram_mfg.txt \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_mfg.txt_murata:system/etc/wifi/nvram_mfg.txt_murata \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_net.txt:system/etc/wifi/nvram_net.txt \ - $(LOCAL_PATH)/proprietary/system/etc/wifi/nvram_net.txt_murata:system/etc/wifi/nvram_net.txt_murata \ - $(LOCAL_PATH)/proprietary/system/lib/libsecril-client.so:system/lib/libsecril-client.so \ - $(LOCAL_PATH)/proprietary/system/vendor/firmware/mfc_fw.bin:system/vendor/firmware/mfc_fw.bin + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcm4330B1.hcd:system/vendor/firmware/bcm4330B1.hcd \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcm4330B1_murata.hcd:system/vendor/firmware/bcm4330B1_murata.hcd \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcm4330B1_semcosh.hcd:system/vendor/firmware/bcm4330B1_semcosh.hcd \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcmdhd_apsta.bin:system/vendor/firmware/bcmdhd_apsta.bin \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcmdhd_mfg.bin:system/vendor/firmware/bcmdhd_mfg.bin \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcmdhd_p2p.bin:system/vendor/firmware/bcmdhd_p2p.bin \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/bcmdhd_sta.bin:system/vendor/firmware/bcmdhd_sta.bin \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/mfc_fw.bin:system/vendor/firmware/mfc_fw.bin \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/nvram_mfg.txt:system/vendor/firmware/nvram_mfg.txt \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/nvram_mfg.txt_murata:system/vendor/firmware/nvram_mfg.txt_murata \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/nvram_net.txt:system/vendor/firmware/nvram_net.txt \ + $(LOCAL_PATH)/proprietary/system/vendor/firmware/nvram_net.txt_murata:system/vendor/firmware/nvram_net.txt_murata \ diff --git a/galaxys2-common/proprietary/system/lib/libsecril-client.so b/galaxys2-common/proprietary/system/lib/libsecril-client.so deleted file mode 100755 index 6f5eca5..0000000 Binary files a/galaxys2-common/proprietary/system/lib/libsecril-client.so and /dev/null differ diff --git a/galaxys2-common/proprietary/system/bin/bcm4330B1.hcd b/galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1.hcd similarity index 100% rename from galaxys2-common/proprietary/system/bin/bcm4330B1.hcd rename to galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1.hcd diff --git a/galaxys2-common/proprietary/system/bin/bcm4330B1_murata.hcd b/galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1_murata.hcd similarity index 100% rename from galaxys2-common/proprietary/system/bin/bcm4330B1_murata.hcd rename to galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1_murata.hcd diff --git a/galaxys2-common/proprietary/system/bin/bcm4330B1_semcosh.hcd b/galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1_semcosh.hcd similarity index 100% rename from galaxys2-common/proprietary/system/bin/bcm4330B1_semcosh.hcd rename to galaxys2-common/proprietary/system/vendor/firmware/bcm4330B1_semcosh.hcd diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_apsta.bin b/galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_apsta.bin similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/bcmdhd_apsta.bin rename to galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_apsta.bin diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_mfg.bin b/galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_mfg.bin similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/bcmdhd_mfg.bin rename to galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_mfg.bin diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_p2p.bin b/galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_p2p.bin similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/bcmdhd_p2p.bin rename to galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_p2p.bin diff --git a/galaxys2-common/proprietary/system/etc/wifi/bcmdhd_sta.bin b/galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_sta.bin similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/bcmdhd_sta.bin rename to galaxys2-common/proprietary/system/vendor/firmware/bcmdhd_sta.bin diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt b/galaxys2-common/proprietary/system/vendor/firmware/nvram_mfg.txt similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt rename to galaxys2-common/proprietary/system/vendor/firmware/nvram_mfg.txt diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt_murata b/galaxys2-common/proprietary/system/vendor/firmware/nvram_mfg.txt_murata similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/nvram_mfg.txt_murata rename to galaxys2-common/proprietary/system/vendor/firmware/nvram_mfg.txt_murata diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt b/galaxys2-common/proprietary/system/vendor/firmware/nvram_net.txt similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt rename to galaxys2-common/proprietary/system/vendor/firmware/nvram_net.txt diff --git a/galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt_murata b/galaxys2-common/proprietary/system/vendor/firmware/nvram_net.txt_murata similarity index 100% rename from galaxys2-common/proprietary/system/etc/wifi/nvram_net.txt_murata rename to galaxys2-common/proprietary/system/vendor/firmware/nvram_net.txt_murata