From 30736327b29c3fe98730d4a6252e987f8a307852 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Wed, 25 Aug 2010 17:25:38 -0700 Subject: [PATCH] [Cleanup] Remove usage of PRODUCT_SPECIFIC_DEFINES on the kernel target now that bravo is not overriding kernels for every device. Also clean up usage of redundant WITH_WINDOWS_MEDIA and global usage of WITH_HTC_ACOUSTIC_HACK. --- products/cyanogen_bravo.mk | 3 --- products/cyanogen_dream_sapphire.mk | 5 +---- products/cyanogen_espresso.mk | 3 --- products/cyanogen_hero.mk | 3 --- products/cyanogen_heroc.mk | 3 --- products/cyanogen_inc.mk | 3 --- products/cyanogen_liberty.mk | 7 ------- products/cyanogen_passion.mk | 3 --- products/cyanogen_sholes.mk | 3 --- products/cyanogen_supersonic.mk | 7 ------- products/cyanogen_vibrant.mk | 10 ---------- 11 files changed, 1 insertion(+), 49 deletions(-) diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk index 4ebaf113..22b27f1a 100644 --- a/products/cyanogen_bravo.mk +++ b/products/cyanogen_bravo.mk @@ -23,9 +23,6 @@ PRODUCT_PACKAGES += Torch # Extra Passion overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bravo -# Use a precompiled kernel until the merge with cm-kernel -PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/bravo/kernel/kernel - # Extra RIL settings PRODUCT_PROPERTY_OVERRIDES += \ ro.ril.enable.managed.roaming=1 \ diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk index 487f7628..2f0bf9de 100644 --- a/products/cyanogen_dream_sapphire.mk +++ b/products/cyanogen_dream_sapphire.mk @@ -47,10 +47,7 @@ else endif # Use the audio profile hack -WITH_DS_HTCACOUSTIC_HACK := true - -# Use Windows Media -WITH_WINDOWS_MEDIA := true +PRODUCT_SPECIFIC_DEFINES += WITH_DS_HTCACOUSTIC_HACK := true # # Copy DS specific prebuilt files diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk index ae583d11..cb1fe815 100644 --- a/products/cyanogen_espresso.mk +++ b/products/cyanogen_espresso.mk @@ -19,9 +19,6 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NA PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-espresso.map -# Build Kernel -PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/espresso/kernel - # Extra Espresso overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/espresso diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk index d32d1dec..13a3373e 100644 --- a/products/cyanogen_hero.mk +++ b/products/cyanogen_hero.mk @@ -20,9 +20,6 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NA # Enable Windows Media WITH_WINDOWS_MEDIA := true -# Build Kernel -PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/hero/kernel - # # Set ro.modversion # diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk index 9676527e..26cbd47b 100644 --- a/products/cyanogen_heroc.mk +++ b/products/cyanogen_heroc.mk @@ -17,9 +17,6 @@ PRODUCT_MODEL := HERO200 PRODUCT_MANUFACTURER := HTC PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=passion BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="heroc-user 2.2 FRF91 43546 release-keys" -# Use Prebuilt kernel from heroC device tree -PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/heroc/kernel - # Extra overlay for Gallery3D orientation hack PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/heroc diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk index 6e68fbd0..5846205d 100644 --- a/products/cyanogen_inc.mk +++ b/products/cyanogen_inc.mk @@ -18,9 +18,6 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NA # Extra Passion overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/passion -# Build Kernel -PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/inc/kernel - # # Set ro.modversion # diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk index 75ecf5a4..ec5c158c 100644 --- a/products/cyanogen_liberty.mk +++ b/products/cyanogen_liberty.mk @@ -19,13 +19,6 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NA PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-liberty.map -# Build kernel -PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/liberty/kernel - - -# Enable Windows Media -WITH_WINDOWS_MEDIA := true - # # Set ro.modversion # diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk index e9b7c87a..152a00e2 100644 --- a/products/cyanogen_passion.mk +++ b/products/cyanogen_passion.mk @@ -34,9 +34,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \ ro.ril.emc.mode=2 -# Enable Windows Media -WITH_WINDOWS_MEDIA := true - # # Set ro.modversion # diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk index c99886fb..fdff2cd0 100644 --- a/products/cyanogen_sholes.mk +++ b/products/cyanogen_sholes.mk @@ -13,9 +13,6 @@ PRODUCT_DEVICE := sholes PRODUCT_MODEL := Droid PRODUCT_MANUFACTURER := Motorola -# Build Kernel -PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/motorola/sholes/kernel - # # Set ro.modversion # diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk index 598c7656..fb17bb1a 100644 --- a/products/cyanogen_supersonic.mk +++ b/products/cyanogen_supersonic.mk @@ -14,13 +14,6 @@ PRODUCT_MODEL := PC36100 PRODUCT_MANUFACTURER := HTC PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NAME=htc_supersonic BUILD_FINGERPRINT=sprint/htc_supersonic/supersonic/supersonic:2.2/FRF91/218634:user/release-keys TARGET_BUILD_TYPE=userdebug BUILD_VERSION_TAGS=release-keys PRIVATE_BUILD_DESC="3.26.651.1 CL218634 release-keys" -PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/htc/supersonic/kernel - -# Build kernel -#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= -#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm -#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_mahimahi_defconfig - # Extra Supersonic overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/supersonic diff --git a/products/cyanogen_vibrant.mk b/products/cyanogen_vibrant.mk index 78695668..146eca5a 100644 --- a/products/cyanogen_vibrant.mk +++ b/products/cyanogen_vibrant.mk @@ -20,16 +20,6 @@ PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 PRODUCT_NA # Extra Vibrant overlay PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vibrant -PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=device/vibrant/kernel - -# Build kernel -#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL= -#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel -#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_smdkc110_defconfig - -# Enable Windows Media -WITH_WINDOWS_MEDIA := true - # # Set ro.modversion #