Skip to content

Commit

Permalink
Merge pull request #706 from andi34/cm-13.0
Browse files Browse the repository at this point in the history
p31xx/p51xx: merge same blobs into espresso-common & updates for M
  • Loading branch information
ciwrl committed Jan 2, 2016
2 parents dac05cd + 3ec3102 commit a5dea1d
Show file tree
Hide file tree
Showing 39 changed files with 61 additions and 224 deletions.
43 changes: 43 additions & 0 deletions espresso-common/common-vendor-blobs.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Copyright (C) 2015 SlimRoms
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

PRODUCT_COPY_FILES += \
vendor/samsung/espresso-common/proprietary/system/bin/gpsd:system/bin/gpsd \
vendor/samsung/espresso-common/proprietary/system/bin/smc.ini:system/bin/smc.ini \
vendor/samsung/espresso-common/proprietary/system/bin/smc_pa.ift:system/bin/smc_pa.ift

PRODUCT_COPY_FILES += \
vendor/samsung/espresso-common/proprietary/system/etc/wifi/bcmdhd_p2p.bin:system/etc/wifi/bcmdhd_p2p.bin \
vendor/samsung/espresso-common/proprietary/system/etc/wifi/nvram_mfg.txt:system/etc/wifi/nvram_mfg.txt \
vendor/samsung/espresso-common/proprietary/system/etc/wifi/nvram_net.txt:system/etc/wifi/nvram_net.txt

PRODUCT_COPY_FILES += \
vendor/samsung/espresso-common/proprietary/system/lib/hw/gps.manta.so:system/lib/hw/gps.omap4.so

PRODUCT_COPY_FILES += \
vendor/samsung/espresso-common/proprietary/system/lib/libQmageDecoder.so:system/lib/libQmageDecoder.so \
vendor/samsung/espresso-common/proprietary/system/lib/libsecnativefeature.so:system/lib/libsecnativefeature.so

PRODUCT_COPY_FILES += \
vendor/samsung/espresso-common/proprietary/system/vendor/firmware/BCM4330.hcd:system/vendor/firmware/BCM4330.hcd \
vendor/samsung/espresso-common/proprietary/system/vendor/firmware/ducati-m3.bin:system/vendor/firmware/ducati-m3.bin

PRODUCT_COPY_FILES += \
vendor/samsung/espresso-common/proprietary/system/lib/libdrmdecrypt.so:system/lib/libdrmdecrypt.so \
vendor/samsung/espresso-common/proprietary/system/vendor/lib/libstlport.so:system/vendor/lib/libstlport.so \
vendor/samsung/espresso-common/proprietary/system/vendor/lib/libwvdrm_L3.so:system/vendor/lib/libwvdrm_L3.so \
vendor/samsung/espresso-common/proprietary/system/vendor/lib/libwvm.so:system/vendor/lib/libwvm.so \
vendor/samsung/espresso-common/proprietary/system/vendor/lib/libWVStreamControlAPI_L3.so:system/vendor/lib/libWVStreamControlAPI_L3.so \
vendor/samsung/espresso-common/proprietary/system/vendor/lib/drm/libdrmwvmplugin.so:system/vendor/lib/drm/libdrmwvmplugin.so \
vendor/samsung/espresso-common/proprietary/system/vendor/lib/mediadrm/libwvdrmengine.so:system/vendor/lib/mediadrm/libwvdrmengine.so
15 changes: 15 additions & 0 deletions espresso-common/espresso-common-vendor.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (C) 2015 SlimRoms
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

$(call inherit-product, vendor/samsung/espresso-common/common-vendor-blobs.mk)
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
File renamed without changes.
29 changes: 1 addition & 28 deletions p31xx/p31xx-vendor-blobs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

PRODUCT_COPY_FILES += \
vendor/samsung/p31xx/common/system/bin/gpsd:system/bin/gpsd \
vendor/samsung/p31xx/common/system/bin/smc.ini:system/bin/smc.ini \
vendor/samsung/p31xx/common/system/bin/smc_pa.ift:system/bin/smc_pa.ift

PRODUCT_COPY_FILES += \
vendor/samsung/p31xx/common/system/etc/wifi/bcmdhd_apsta.bin:system/etc/wifi/bcmdhd_apsta.bin \
vendor/samsung/p31xx/common/system/etc/wifi/bcmdhd_mfg.bin:system/etc/wifi/bcmdhd_mfg.bin \
vendor/samsung/p31xx/common/system/etc/wifi/bcmdhd_p2p.bin:system/etc/wifi/bcmdhd_p2p.bin \
vendor/samsung/p31xx/common/system/etc/wifi/bcmdhd_sta.bin:system/etc/wifi/bcmdhd_sta.bin \
vendor/samsung/p31xx/common/system/etc/wifi/nvram_mfg.txt:system/etc/wifi/nvram_mfg.txt \
vendor/samsung/p31xx/common/system/etc/wifi/nvram_net.txt:system/etc/wifi/nvram_net.txt

PRODUCT_COPY_FILES += \
vendor/samsung/p31xx/common/system/lib/hw/gps.manta.so:system/lib/hw/gps.omap4.so

PRODUCT_COPY_FILES += \
vendor/samsung/p31xx/common/system/lib/libQmageDecoder.so:system/lib/libQmageDecoder.so \
vendor/samsung/p31xx/common/system/lib/libsecnativefeature.so:system/lib/libsecnativefeature.so

PRODUCT_COPY_FILES += \
vendor/samsung/p31xx/common/system/vendor/firmware/BCM4330.hcd:system/vendor/firmware/BCM4330.hcd \
vendor/samsung/p31xx/common/system/vendor/firmware/ducati-m3.bin:system/vendor/firmware/ducati-m3.bin

PRODUCT_COPY_FILES += \
vendor/samsung/p31xx/common/system/lib/libdrmdecrypt.so:system/lib/libdrmdecrypt.so \
vendor/samsung/p31xx/common/system/vendor/lib/libwvdrm_L3.so:system/vendor/lib/libwvdrm_L3.so \
vendor/samsung/p31xx/common/system/vendor/lib/libwvm.so:system/vendor/lib/libwvm.so \
vendor/samsung/p31xx/common/system/vendor/lib/libWVStreamControlAPI_L3.so:system/vendor/lib/libWVStreamControlAPI_L3.so \
vendor/samsung/p31xx/common/system/vendor/lib/drm/libdrmwvmplugin.so:system/vendor/lib/drm/libdrmwvmplugin.so \
vendor/samsung/p31xx/common/system/vendor/lib/mediadrm/libwvdrmengine.so:system/vendor/lib/mediadrm/libwvdrmengine.so
vendor/samsung/p31xx/common/system/etc/wifi/bcmdhd_sta.bin:system/etc/wifi/bcmdhd_sta.bin
Binary file removed p51xx/common/system/bin/gpsd
Binary file not shown.
25 changes: 0 additions & 25 deletions p51xx/common/system/bin/smc.ini

This file was deleted.

Binary file removed p51xx/common/system/bin/smc_pa.ift
Binary file not shown.
Binary file removed p51xx/common/system/etc/wifi/bcmdhd_p2p.bin
Binary file not shown.
73 changes: 0 additions & 73 deletions p51xx/common/system/etc/wifi/nvram_mfg.txt

This file was deleted.

73 changes: 0 additions & 73 deletions p51xx/common/system/etc/wifi/nvram_net.txt

This file was deleted.

Binary file removed p51xx/common/system/lib/hw/gps.manta.so
Binary file not shown.
Binary file removed p51xx/common/system/lib/libQmageDecoder.so
Binary file not shown.
Binary file removed p51xx/common/system/lib/libdrmdecrypt.so
Binary file not shown.
Binary file removed p51xx/common/system/lib/libsecnativefeature.so
Binary file not shown.
Binary file removed p51xx/common/system/vendor/firmware/BCM4330.hcd
Binary file not shown.
Binary file removed p51xx/common/system/vendor/firmware/ducati-m3.bin
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed p51xx/common/system/vendor/lib/libwvdrm_L3.so
Binary file not shown.
Binary file removed p51xx/common/system/vendor/lib/libwvm.so
Binary file not shown.
Binary file not shown.
27 changes: 2 additions & 25 deletions p51xx/p51xx-vendor-blobs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,15 @@
# limitations under the License.

PRODUCT_COPY_FILES += \
vendor/samsung/p51xx/common/system/bin/bintvoutservice:system/bin/bintvoutservice \
vendor/samsung/p51xx/common/system/bin/gpsd:system/bin/gpsd \
vendor/samsung/p51xx/common/system/bin/smc.ini:system/bin/smc.ini \
vendor/samsung/p51xx/common/system/bin/smc_pa.ift:system/bin/smc_pa.ift
vendor/samsung/p51xx/common/system/bin/bintvoutservice:system/bin/bintvoutservice

PRODUCT_COPY_FILES += \
vendor/samsung/p51xx/common/system/etc/wifi/bcmdhd_apsta.bin:system/etc/wifi/bcmdhd_apsta.bin \
vendor/samsung/p51xx/common/system/etc/wifi/bcmdhd_mfg.bin:system/etc/wifi/bcmdhd_mfg.bin \
vendor/samsung/p51xx/common/system/etc/wifi/bcmdhd_p2p.bin:system/etc/wifi/bcmdhd_p2p.bin \
vendor/samsung/p51xx/common/system/etc/wifi/bcmdhd_sta.bin:system/etc/wifi/bcmdhd_sta.bin \
vendor/samsung/p51xx/common/system/etc/wifi/nvram_mfg.txt:system/etc/wifi/nvram_mfg.txt \
vendor/samsung/p51xx/common/system/etc/wifi/nvram_net.txt:system/etc/wifi/nvram_net.txt

PRODUCT_COPY_FILES += \
vendor/samsung/p51xx/common/system/lib/hw/gps.manta.so:system/lib/hw/gps.omap4.so
vendor/samsung/p51xx/common/system/etc/wifi/bcmdhd_sta.bin:system/etc/wifi/bcmdhd_sta.bin

PRODUCT_COPY_FILES += \
vendor/samsung/p51xx/common/system/lib/libhdcp.so:system/lib/libhdcp.so \
vendor/samsung/p51xx/common/system/lib/libQmageDecoder.so:system/lib/libQmageDecoder.so \
vendor/samsung/p51xx/common/system/lib/libsecnativefeature.so:system/lib/libsecnativefeature.so \
vendor/samsung/p51xx/common/system/lib/libtvoutinterface.so:system/lib/libtvoutinterface.so \
vendor/samsung/p51xx/common/system/lib/libtvout_jni.so:system/lib/libtvout_jni.so \
vendor/samsung/p51xx/common/system/lib/libtvoutservice.so:system/lib/libtvoutservice.so

PRODUCT_COPY_FILES += \
vendor/samsung/p51xx/common/system/vendor/firmware/BCM4330.hcd:system/vendor/firmware/BCM4330.hcd \
vendor/samsung/p51xx/common/system/vendor/firmware/ducati-m3.bin:system/vendor/firmware/ducati-m3.bin

PRODUCT_COPY_FILES += \
vendor/samsung/p51xx/common/system/lib/libdrmdecrypt.so:system/lib/libdrmdecrypt.so \
vendor/samsung/p51xx/common/system/vendor/lib/libwvdrm_L3.so:system/vendor/lib/libwvdrm_L3.so \
vendor/samsung/p51xx/common/system/vendor/lib/libwvm.so:system/vendor/lib/libwvm.so \
vendor/samsung/p51xx/common/system/vendor/lib/libWVStreamControlAPI_L3.so:system/vendor/lib/libWVStreamControlAPI_L3.so \
vendor/samsung/p51xx/common/system/vendor/lib/drm/libdrmwvmplugin.so:system/vendor/lib/drm/libdrmwvmplugin.so \
vendor/samsung/p51xx/common/system/vendor/lib/mediadrm/libwvdrmengine.so:system/vendor/lib/mediadrm/libwvdrmengine.so

0 comments on commit a5dea1d

Please sign in to comment.