diff --git a/extract-files.sh b/extract-files.sh index 8b31d5f..aa6f6e2 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -80,10 +80,10 @@ PRODUCT_COPY_FILES += \\ vendor/__MANUFACTURER__/__DEVICE__/proprietary/BCM4329B1_002.002.023.0360.0362.hcd:system/etc/firmware/BCM4329B1_002.002.023.0360.0362.hcd \\ vendor/__MANUFACTURER__/__DEVICE__/proprietary/BCM4329B1_002.002.023.0436.0439.hcd:system/etc/firmware/BCM4329B1_002.002.023.0436.0439.hcd \\ vendor/__MANUFACTURER__/__DEVICE__/proprietary/BCM4329B1_002.002.023.0511.0538.hcd:system/etc/firmware/BCM4329B1_002.002.023.0511.0538.hcd \\ -vendor/__MANUFACTURER__/__DEVICE__/proprietary/htcleo.acdb:system/etc/firmware/htcleo.acdb \\ + vendor/__MANUFACTURER__/__DEVICE__/proprietary/htcleo.acdb:system/etc/firmware/htcleo.acdb \\ vendor/__MANUFACTURER__/__DEVICE__/proprietary/bcm4329.hcd:system/etc/firmware/bcm4329.hcd \\ - vendor/__MANUFACTURER__/__DEVICE__/proprietary/htcleo.acdb:system/etc/firmware/htcleo.acdb \\ - vendor/__MANUFACTURER__/__DEVICE__/proprietary/default.acdb:system/etc/firmware/default.acdb \\ + vendor/__MANUFACTURER__/__DEVICE__/proprietary/htcleo.acdb:system/etc/firmware/htcleo.acdb \\ + vendor/__MANUFACTURER__/__DEVICE__/proprietary/default.acdb:system/etc/firmware/default.acdb \\ vendor/__MANUFACTURER__/__DEVICE__/proprietary/yamato_pfp.fw:system/etc/firmware/yamato_pfp.fw \\ vendor/__MANUFACTURER__/__DEVICE__/proprietary/yamato_pm4.fw:system/etc/firmware/yamato_pm4.fw \\ vendor/__MANUFACTURER__/__DEVICE__/proprietary/libEGL_adreno200.so:system/lib/egl/libEGL_adreno200.so \\ @@ -98,7 +98,7 @@ vendor/__MANUFACTURER__/__DEVICE__/proprietary/htcleo.acdb:system/etc/firmware/h vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxVdec.so:system/lib/libOmxVdec.so \\ vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxVidEnc.so:system/lib/libOmxVidEnc.so \\ vendor/__MANUFACTURER__/__DEVICE__/proprietary/libOmxCore.so:system/lib/libOmxCore.so \\ -vendor/__MANUFACTURER__/__DEVICE__/proprietary/sensors.bravo.so:system/lib/hw/sensors.bravo.so \\ + vendor/__MANUFACTURER__/__DEVICE__/proprietary/sensors.bravo.so:system/lib/hw/sensors.bravo.so \\ EOF ./setup-makefiles.sh diff --git a/leo.mk b/leo.mk index 484a89e..165d92d 100755 --- a/leo.mk +++ b/leo.mk @@ -47,7 +47,7 @@ PRODUCT_COPY_FILES += \ # media config xml file PRODUCT_COPY_FILES += \ - device/htc/leo/media_profiles.xml:system/etc/media_profiles.xml + device/htc/leo/prebuilt/media_profiles.xml:system/etc/media_profiles.xml # This file is used to install the enable RMNET and corresponding modules which dont get activated by normal module script PRODUCT_COPY_FILES += \ @@ -74,18 +74,18 @@ PRODUCT_COPY_FILES += \ # Keylayouts PRODUCT_COPY_FILES += \ - device/htc/leo/keylayout/leo-keypad.kl:system/usr/keylayout/leo-keypad.kl \ - device/htc/leo/keylayout/leo-keypad.kcm.bin:system/usr/keychars/leo-keypad.kcm.bin \ - device/htc/leo/keylayout/h2w_headset.kl:system/usr/keylayout/h2w_headset.kl + device/htc/leo/prebuilt/keylayout/leo-keypad.kl:system/usr/keylayout/leo-keypad.kl \ + device/htc/leo/prebuilt/keylayout/leo-keypad.kcm.bin:system/usr/keychars/leo-keypad.kcm.bin \ + device/htc/leo/prebuilt/keylayout/h2w_headset.kl:system/usr/keylayout/h2w_headset.kl # Firmware PRODUCT_COPY_FILES += \ - device/htc/leo/firmware/fw_bcm4329.bin:system/etc/firmware/fw_bcm4329.bin \ - device/htc/leo/firmware/fw_bcm4329_apsta.bin:system/etc/firmware/fw_bcm4329_apsta.bin + device/htc/leo/prebuilt/firmware/fw_bcm4329.bin:system/etc/firmware/fw_bcm4329.bin \ + device/htc/leo/prebuilt/firmware/fw_bcm4329_apsta.bin:system/etc/firmware/fw_bcm4329_apsta.bin #GSM APN LIST PRODUCT_COPY_FILES += \ -vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml + vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml PRODUCT_COPY_FILES += \ diff --git a/firmware/fw_bcm4329.bin b/prebuilt/firmware/fw_bcm4329.bin similarity index 100% rename from firmware/fw_bcm4329.bin rename to prebuilt/firmware/fw_bcm4329.bin diff --git a/firmware/fw_bcm4329_apsta.bin b/prebuilt/firmware/fw_bcm4329_apsta.bin similarity index 100% rename from firmware/fw_bcm4329_apsta.bin rename to prebuilt/firmware/fw_bcm4329_apsta.bin diff --git a/keylayout/h2w_headset.kl b/prebuilt/keylayout/h2w_headset.kl similarity index 100% rename from keylayout/h2w_headset.kl rename to prebuilt/keylayout/h2w_headset.kl diff --git a/keylayout/leo-keypad.kcm.bin b/prebuilt/keylayout/leo-keypad.kcm.bin similarity index 100% rename from keylayout/leo-keypad.kcm.bin rename to prebuilt/keylayout/leo-keypad.kcm.bin diff --git a/keylayout/leo-keypad.kl b/prebuilt/keylayout/leo-keypad.kl similarity index 100% rename from keylayout/leo-keypad.kl rename to prebuilt/keylayout/leo-keypad.kl diff --git a/media_profiles.xml b/prebuilt/media_profiles.xml similarity index 100% rename from media_profiles.xml rename to prebuilt/media_profiles.xml diff --git a/unzip-files.sh b/unzip-files.sh index e765f36..86a684c 100755 --- a/unzip-files.sh +++ b/unzip-files.sh @@ -41,7 +41,6 @@ chmod 755 ../../../vendor/htc/$DEVICE/proprietary/parse_radio_log # Prebuilt libraries that are needed to build open-source libraries PRODUCT_COPY_FILES := \\ - vendor/htc/__DEVICE__/proprietary/libgps.so:obj/lib/libgps.so \\ vendor/htc/__DEVICE__/proprietary/libcamera.so:obj/lib/libcamera.so # All the blobs necessary for leo @@ -64,7 +63,6 @@ PRODUCT_COPY_FILES += \\ vendor/htc/__DEVICE__/proprietary/libGLESv2_adreno200.so:/system/lib/egl/libGLESv2_adreno200.so \\ vendor/htc/__DEVICE__/proprietary/libq3dtools_adreno200.so:/system/lib/egl/libq3dtools_adreno200.so \\ vendor/htc/__DEVICE__/proprietary/libcamera.so:/system/lib/libcamera.so \\ - vendor/htc/__DEVICE__/proprietary/libgps.so:/system/lib/libgps.so \\ vendor/htc/__DEVICE__/proprietary/libgsl.so:/system/lib/libgsl.so \\ vendor/htc/__DEVICE__/proprietary/libhtc_acoustic.so:/system/lib/libhtc_acoustic.so \\ vendor/htc/__DEVICE__/proprietary/libhtc_ril.so:/system/lib/libhtc_ril.so \\