diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-03-10 12:25:41 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-03-10 12:25:41 -0800 |
| commit | c7b5c2f6eee7ff600798d8852aa3d035abec66b4 (patch) | |
| tree | 0154aab2008bb55bd38f9245ef5ba5b07a81ed91 | |
| parent | 2ce5655d93975641a90bab1a0369b448b2f31f39 (diff) | |
| download | sapphire-c7b5c2f6eee7ff600798d8852aa3d035abec66b4.tar.gz | |
Clean up inheritance to make it open-source-friendly
Change-Id: I8e9bf0fb5b15a75d714d81f035eee6403cfbcc11
| -rw-r--r-- | device_sapphire.mk | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/device_sapphire.mk b/device_sapphire.mk index b5f4d28..11c2adb 100644 --- a/device_sapphire.mk +++ b/device_sapphire.mk @@ -14,12 +14,6 @@ # limitations under the License. # -# To be included directly by a device_sapphire*.mk makefile; -# do not use inherit-product on this file. - -# stuff common to all HTC phones -$(call inherit-product, device/htc/common/common.mk) - PRODUCT_MANUFACTURER := HTC DEVICE_PACKAGE_OVERLAYS := device/htc/sapphire/overlay device/htc/common/overlay vendor/htc/common/overlay @@ -35,13 +29,16 @@ PRODUCT_COPY_FILES += \ frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ frameworks/base/data/etc/android.hardware.touchscreen.multitouch.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.xml -#include Windows Media -include vendor/pv/wm/WindowsMedia.mk - - PRODUCT_PROPERTY_OVERRIDES += ro.media.dec.jpeg.memcap=10000000 # media configuration xml file PRODUCT_COPY_FILES += \ device/htc/sapphire/media_profiles.xml:/system/etc/media_profiles.xml + +# proprietary side of sapphire +$(call inherit-product-if-exists, vendor/htc/sapphire/device_sapphire-vendor.mk) + +# stuff common to all HTC phones +$(call inherit-product, device/htc/common/common.mk) + |