From 1935a5bd71c3b827bb855b573fc88b3818ed7198 Mon Sep 17 00:00:00 2001 From: Shawn Alty Date: Thu, 24 Nov 2011 01:11:54 -0600 Subject: Move some stuff around Rename galaxysmtd.mk to device.mk that inherits device_base.mk from aries-common. --- device.mk | 66 +++++++++++++++++++ full_galaxysmtd.mk | 2 +- galaxysmtd.mk | 188 ----------------------------------------------------- 3 files changed, 67 insertions(+), 189 deletions(-) create mode 100644 device.mk delete mode 100644 galaxysmtd.mk diff --git a/device.mk b/device.mk new file mode 100644 index 0000000..3ce91eb --- /dev/null +++ b/device.mk @@ -0,0 +1,66 @@ +# Copyright (C) 2010 The Android Open Source Project +# +# 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. + + +# This file is the device-specific product definition file for +# crespo. It lists all the overlays, files, modules and properties +# that are specific to this hardware: i.e. those are device-specific +# drivers, configuration files, settings, etc... + +# Note that crespo is not a fully open device. Some of the drivers +# aren't publicly available in all circumstances, which means that some +# of the hardware capabilities aren't present in builds where those +# drivers aren't available. Such cases are handled by having this file +# separated into two halves: this half here contains the parts that +# are available to everyone, while another half in the vendor/ hierarchy +# augments that set with the parts that are only relevant when all the +# associated drivers are available. Aspects that are irrelevant but +# harmless in no-driver builds should be kept here for simplicity and +# transparency. There are two variants of the half that deals with +# the unavailable drivers: one is directly checked into the unreleased +# vendor tree and is used by engineers who have access to it. The other +# is generated by setup-makefile.sh in the same directory as this files, +# and is used by people who have access to binary versions of the drivers +# but not to the original vendor tree. Be sure to update both. + +# These are the hardware-specific configuration files +PRODUCT_COPY_FILES := \ + device/samsung/galaxysmtd/asound.conf:system/etc/asound.conf + +# Prebuilt kl keymaps +PRODUCT_COPY_FILES += \ + device/samsung/galaxysmtd/aries-keypad.kl:system/usr/keylayout/aries-keypad.kl + +# kernel modules +PRODUCT_COPY_FILES += $(foreach module,\ + $(wildcard device/samsung/galaxysmtd/*.ko),\ + $(module):system/lib/modules/$(notdir $(module))) + +ifeq ($(TARGET_PREBUILT_KERNEL),) + LOCAL_KERNEL := device/samsung/galaxysmtd/kernel +else + LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) +endif + +PRODUCT_COPY_FILES += \ + $(LOCAL_KERNEL):kernel + +# Inherit Aries common device configuration. +$(call inherit-product, device/samsung/aries-common/device_base.mk) + +# See comment at the top of this file. This is where the other +# half of the device-specific product definition file takes care +# of the aspects that require proprietary drivers that aren't +# commonly available +$(call inherit-product-if-exists, vendor/samsung/galaxysmtd/galaxysmtd-vendor.mk) diff --git a/full_galaxysmtd.mk b/full_galaxysmtd.mk index 694b898..fdde1da 100644 --- a/full_galaxysmtd.mk +++ b/full_galaxysmtd.mk @@ -23,7 +23,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) # This is where we'd set a backup provider if we had one #$(call inherit-product, device/sample/products/backup_overlay.mk) -$(call inherit-product, device/samsung/galaxysmtd/galaxysmtd.mk) +$(call inherit-product, device/samsung/galaxysmtd/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full.mk) # Galaxy S uses high-density artwork where available diff --git a/galaxysmtd.mk b/galaxysmtd.mk deleted file mode 100644 index 22a0d8e..0000000 --- a/galaxysmtd.mk +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright (C) 2010 The Android Open Source Project -# -# 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. - - -# This file is the device-specific product definition file for -# crespo. It lists all the overlays, files, modules and properties -# that are specific to this hardware: i.e. those are device-specific -# drivers, configuration files, settings, etc... - -# Note that crespo is not a fully open device. Some of the drivers -# aren't publicly available in all circumstances, which means that some -# of the hardware capabilities aren't present in builds where those -# drivers aren't available. Such cases are handled by having this file -# separated into two halves: this half here contains the parts that -# are available to everyone, while another half in the vendor/ hierarchy -# augments that set with the parts that are only relevant when all the -# associated drivers are available. Aspects that are irrelevant but -# harmless in no-driver builds should be kept here for simplicity and -# transparency. There are two variants of the half that deals with -# the unavailable drivers: one is directly checked into the unreleased -# vendor tree and is used by engineers who have access to it. The other -# is generated by setup-makefile.sh in the same directory as this files, -# and is used by people who have access to binary versions of the drivers -# but not to the original vendor tree. Be sure to update both. - - -# These is the hardware-specific overlay, which points to the location -# of hardware-specific resource overrides, typically the frameworks and -# application settings that are stored in resourced. -DEVICE_PACKAGE_OVERLAYS := device/samsung/aries-common/overlay - -# These are the hardware-specific configuration files -PRODUCT_COPY_FILES := \ - device/samsung/galaxysmtd/asound.conf:system/etc/asound.conf \ - device/samsung/aries-common/vold.fstab:system/etc/vold.fstab \ - device/samsung/aries-common/egl.cfg:system/lib/egl/egl.cfg \ - device/samsung/aries-common/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc - -# Init files -PRODUCT_COPY_FILES += \ - device/samsung/aries-common/init.aries.rc:root/init.aries.rc \ - device/samsung/aries-common/init.aries.usb.rc:root/init.aries.usb.rc \ - device/samsung/aries-common/lpm.rc:root/lpm.rc \ - device/samsung/aries-common/ueventd.aries.rc:root/ueventd.aries.rc \ - device/samsung/aries-common/setupenv.sh:recovery/root/sbin/setupenv.sh - - -# Prebuilt kl keymaps -PRODUCT_COPY_FILES += \ - device/samsung/aries-common/cypress-touchkey.kl:system/usr/keylayout/cypress-touchkey.kl \ - device/samsung/aries-common/sec_jack.kl:system/usr/keylayout/sec_jack.kl \ - device/samsung/galaxysmtd/aries-keypad.kl:system/usr/keylayout/aries-keypad.kl \ - device/samsung/aries-common/s3c-keypad.kl:system/usr/keylayout/s3c-keypad.kl - -# Generated kcm keymaps -PRODUCT_PACKAGES := \ - cypress-touchkey.kcm \ - s3c-keypad.kcm - -# Filesystem management tools -PRODUCT_PACKAGES += \ - make_ext4fs \ - setup_fs - -# These are the OpenMAX IL configuration files -PRODUCT_COPY_FILES += \ - device/samsung/aries-common/sec_mm/sec_omx/sec_omx_core/secomxregistry:system/etc/secomxregistry \ - device/samsung/aries-common/media_profiles.xml:system/etc/media_profiles.xml - -# These are the OpenMAX IL modules -PRODUCT_PACKAGES += \ - libSEC_OMX_Core.aries \ - libOMX.SEC.AVC.Decoder.aries \ - libOMX.SEC.M4V.Decoder.aries \ - libOMX.SEC.M4V.Encoder.aries \ - libOMX.SEC.AVC.Encoder.aries - -# Misc other modules -PRODUCT_PACKAGES += \ - lights.aries \ - sensors.aries \ - audio.primary.aries \ - audio_policy.aries - -# Libs -PRODUCT_PACKAGES += \ - libstagefrighthw - - -# apns config file -PRODUCT_COPY_FILES += \ - development/data/etc/apns-conf.xml:system/etc/apns-conf.xml - -# Bluetooth MAC Address -PRODUCT_PACKAGES += \ - bdaddr_read - -# Device-specific packages -PRODUCT_PACKAGES += \ - SamsungServiceMode \ - AriesParts - -# These are the hardware-specific features -PRODUCT_COPY_FILES += \ - frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \ - frameworks/base/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \ - frameworks/base/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \ - frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \ - frameworks/base/data/etc/android.hardware.location.xml:system/etc/permissions/android.hardware.location.xml \ - frameworks/base/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \ - frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \ - frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \ - frameworks/base/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \ - frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \ - frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \ - packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml - -# The OpenGL ES API level that is natively supported by this device. -# This is a 16.16 fixed point number -PRODUCT_PROPERTY_OVERRIDES := \ - ro.opengles.version=131072 - -# These are the hardware-specific settings that are stored in system properties. -# Note that the only such settings should be the ones that are too low-level to -# be reachable from resources or other mechanisms. -PRODUCT_PROPERTY_OVERRIDES += \ - wifi.interface=eth0 \ - wifi.supplicant_scan_interval=20 \ - ro.telephony.ril_class=samsung \ - ro.telephony.ril.v3=1 \ - mobiledata.interfaces=pdp0,eth0,gprs,ppp0 \ - dalvik.vm.heapsize=32m - -# enable Google-specific location features, -# like NetworkLocationProvider and LocationCollector -PRODUCT_PROPERTY_OVERRIDES += \ - ro.com.google.locationfeatures=1 \ - ro.com.google.networklocation=1 - -# Extended JNI checks -# The extended JNI checks will cause the system to run more slowly, but they can spot a variety of nasty bugs -# before they have a chance to cause problems. -# Default=true for development builds, set by android buildsystem. -PRODUCT_PROPERTY_OVERRIDES += \ - ro.kernel.android.checkjni=0 \ - dalvik.vm.checkjni=false \ - persist.sys.vold.switchexternal=1 - -# Set default USB interface -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - persist.sys.usb.config=mtp - -# we have enough storage space to hold precise GC data -PRODUCT_TAGS += dalvik.gc.type-precise - -# kernel modules -PRODUCT_COPY_FILES += $(foreach module,\ - $(wildcard device/samsung/galaxysmtd/*.ko),\ - $(module):system/lib/modules/$(notdir $(module))) - -ifeq ($(TARGET_PREBUILT_KERNEL),) - LOCAL_KERNEL := device/samsung/galaxysmtd/kernel -else - LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) -endif - -PRODUCT_COPY_FILES += \ - $(LOCAL_KERNEL):kernel - -PRODUCT_COPY_FILES += \ - device/samsung/aries-common/updater.sh:updater.sh - -# See comment at the top of this file. This is where the other -# half of the device-specific product definition file takes care -# of the aspects that require proprietary drivers that aren't -# commonly available -$(call inherit-product-if-exists, vendor/samsung/galaxysmtd/galaxysmtd-vendor.mk) -- cgit v1.2.3