diff options
| author | Andreas Blaesius <skate4life@gmx.de> | 2016-07-02 14:25:20 +0200 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2016-07-02 14:25:42 +0200 |
| commit | 977a066fe18dad1e4e9ead1e56d9bdcece8e1f6b (patch) | |
| tree | f9417d45edbedffe14e3dd312843f5128c691485 | |
| parent | c13fdd71fb74c3a899bc89f97469b72e8c792bbc (diff) | |
| download | device_samsung_espresso3g-977a066fe18dad1e4e9ead1e56d9bdcece8e1f6b.zip device_samsung_espresso3g-977a066fe18dad1e4e9ead1e56d9bdcece8e1f6b.tar.gz device_samsung_espresso3g-977a066fe18dad1e4e9ead1e56d9bdcece8e1f6b.tar.bz2 | |
More cleanup, reorder files and sync with AOSP
- move CM specific defines to a seperate BoardConfigCM.mk
Change-Id: Ia009f98004857eac16eb7960f9d8688636e3d109
| -rw-r--r-- | BoardConfig.mk | 6 | ||||
| -rw-r--r-- | BoardConfigCM.mk | 3 | ||||
| -rw-r--r-- | aosp_espresso3g.mk | 2 | ||||
| -rw-r--r-- | device.mk | 10 |
4 files changed, 13 insertions, 8 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 8b9bcc7..c0b9ec2 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -13,6 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# Inherit CM specific BoardConfig +-include device/samsung/espresso3g/BoardConfigCM.mk # Include common espresso BoardConfig include device/samsung/espressowifi/BoardConfigCommon.mk @@ -23,13 +25,11 @@ TARGET_SPECIFIC_HEADER_PATH += device/samsung/espresso3g/include TARGET_OTA_ASSERT_DEVICE := espresso3g,espresso-common,p3100,GT-P3100,espressorf,espressorfxx,p5100,GT-P5100,espresso10rf,espresso10rfxx # RIL -BOARD_VENDOR := samsung BOARD_PROVIDES_LIBRIL := true -BOARD_MODEM_TYPE := xmm6260 BOARD_RIL_CLASS := ../../../device/samsung/espresso3g/ril COMMON_GLOBAL_CFLAGS += -DDISABLE_ASHMEM_TRACKING -# Selinux +# SELinux BOARD_SEPOLICY_DIRS += \ device/samsung/espresso3g/sepolicy diff --git a/BoardConfigCM.mk b/BoardConfigCM.mk new file mode 100644 index 0000000..c81f862 --- /dev/null +++ b/BoardConfigCM.mk @@ -0,0 +1,3 @@ +# RIL +BOARD_VENDOR := samsung +BOARD_MODEM_TYPE := xmm6260 diff --git a/aosp_espresso3g.mk b/aosp_espresso3g.mk index a228f77..3b3b00f 100644 --- a/aosp_espresso3g.mk +++ b/aosp_espresso3g.mk @@ -23,8 +23,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # Inherit device specific configuration $(call inherit-product, device/samsung/espresso3g/device.mk) -PRODUCT_DEVICE := espresso3g PRODUCT_NAME := aosp_espresso3g +PRODUCT_DEVICE := espresso3g PRODUCT_BRAND := Android PRODUCT_MODEL := Galaxy Tab 2 3G PRODUCT_MANUFACTURER := Samsung @@ -15,16 +15,18 @@ # # Include espresso-common makefile -$(call inherit-product, device/samsung/espressowifi/espresso-common.mk) +$(call inherit-product, device/samsung/espressowifi/device-common.mk) + +LOCAL_PATH := device/samsung/espresso3g # Include 3g overlays DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay/aosp # Audio configs PRODUCT_COPY_FILES += \ - device/samsung/espresso3g/audio/audio_policy.conf:system/etc/audio_policy.conf \ - device/samsung/espresso3g/audio/tiny_hw_espresso.xml:system/etc/sound/espresso \ - device/samsung/espresso3g/audio/tiny_hw_espresso10.xml:system/etc/sound/espresso10 + $(LOCAL_PATH)/audio/audio_policy.conf:system/etc/audio_policy.conf \ + $(LOCAL_PATH)/audio/tiny_hw_espresso.xml:system/etc/sound/espresso \ + $(LOCAL_PATH)/audio/tiny_hw_espresso10.xml:system/etc/sound/espresso10 # RIL PRODUCT_PACKAGES += \ |