diff --git a/CleanSpec.mk b/CleanSpec.mk deleted file mode 100644 index 18fb296..0000000 --- a/CleanSpec.mk +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright (C) 2012 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. -# - -# If you don't need to do a full clean build but would like to touch -# a file or delete some intermediate files, add a clean step to the end -# of the list. These steps will only be run once, if they haven't been -# run before. -# -# E.g.: -# $(call add-clean-step, touch -c external/sqlite/sqlite3.h) -# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates) -# -# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with -# files that are missing or have been moved. -# -# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory. -# Use $(OUT_DIR) to refer to the "out" directory. -# -# If you need to re-do something that's already mentioned, just copy -# the command and add it to the bottom of the list. E.g., if a change -# that you made last week required touching a file and a change you -# made today requires touching the same file, just copy the old -# touch step and add it to the end of the list. -# -# ************************************************ -# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST -# ************************************************ - -# For example: -#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates) -#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates) -#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) -#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) - -# ************************************************ -# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST -# ************************************************ -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Phone_intermediates) diff --git a/cm.mk b/cm.mk index 97ef5ac..3dc7f61 100644 --- a/cm.mk +++ b/cm.mk @@ -6,7 +6,7 @@ $(call inherit-product, vendor/cm/config/gsm.mk) # Inherit CM common Phone stuff. $(call inherit-product, vendor/cm/config/common_full_phone.mk) -PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vision BUILD_FINGERPRINT=htc_wwe/htc_vision/vision:4.2.2/JDQ39/87995:user/release-keys PRIVATE_BUILD_DESC="4.2.2 Andromadus release-keys" +PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vision BUILD_FINGERPRINT=htc_wwe/htc_vision/vision:4.3.1/JLS63I/87995:user/release-keys PRIVATE_BUILD_DESC="4.3.1 Andromadus test-keys" PRODUCT_NAME := cm_vision PRODUCT_DEVICE := vision diff --git a/device.mk b/device.mk index cff507b..b5fa170 100644 --- a/device.mk +++ b/device.mk @@ -18,38 +18,18 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) #Andromadus Vendor include -# The gps config appropriate for this device -PRODUCT_COPY_FILES += \ - device/htc/vision/configs/gps.conf:system/etc/gps.conf - -## (1) First, the most specific values, i.e. the aspects that are specific to GSM - PRODUCT_COPY_FILES += \ device/htc/vision/ramdisk/init.vision.rc:root/init.vision.rc \ device/htc/vision/ramdisk/ueventd.vision.rc:root/ueventd.vision.rc \ device/htc/msm7x30-common/rootdir/fstab.msm7x30:root/fstab.vision # the line above is terribly dirty hack. But fstab doesn't work without it for some reason. -## (2) Also get non-open-source GSM-specific aspects if available -$(call inherit-product-if-exists, vendor/htc/vision/device-vendor.mk) - -## (3) Finally, the least specific parts, i.e. the non-GSM-specific aspects -PRODUCT_PROPERTY_OVERRIDES += \ - ro.com.google.locationfeatures=1 \ - ro.com.google.networklocation=1 \ - ro.com.google.gmsversion=2.3_r3 \ - ro.setupwizard.enable_bypass=1 \ - ro.kernel.android.checkjni=0 - # Override /proc/sys/vm/dirty_ratio on UMS PRODUCT_PROPERTY_OVERRIDES += \ ro.vold.umsdirtyratio=20 DEVICE_PACKAGE_OVERLAYS += device/htc/vision/overlay -PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \ - # gsm config xml file PRODUCT_COPY_FILES += \ device/htc/vision/configs/voicemail-conf.xml:system/etc/voicemail-conf.xml @@ -116,8 +96,8 @@ PRODUCT_COPY_FILES += \ device/htc/vision/firmware/vidc_720p_mp2_dec_mc.fw:system/etc/firmware/vidc_720p_mp2_dec_mc.fw \ device/htc/vision/firmware/Vision_SPK.acdb:system/etc/firmware/Vision_SPK.acdb -# Alternate NAM gps.conf to NAM package -PRODUCT_COPY_FILES += device/common/gps/gps.conf_US:system/etc/nam/gps.conf +# The gps config appropriate for this device +PRODUCT_COPY_FILES += device/htc/vision/configs/gps.conf:system/etc/gps.conf # Copy bcm4329 firmware $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4329/device-bcm.mk) @@ -126,8 +106,11 @@ $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4329 $(call inherit-product, device/htc/msm7x30-common/msm7x30.mk) # htc audio settings -$(call inherit-product, device/htc/vision/media_htcaudio.mk) -$(call inherit-product, device/htc/vision/media_a1026.mk) +PRODUCT_PROPERTY_OVERRIDES += \ + media.a1026.nsForVoiceRec = 0 \ + media.a1026.enableA1026 = 1 \ + htc.audio.alt.enable=0 \ + htc.audio.hac.enable=0 $(call inherit-product, frameworks/native/build/phone-hdpi-512-dalvik-heap.mk) diff --git a/extract-files.sh b/extract-files.sh deleted file mode 100755 index c0e083b..0000000 --- a/extract-files.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -BASE=../../../vendor/htc/vision/proprietary -rm -rf $BASE/* - -for FILE in `egrep -v '(^#|^$)' proprietary-files.txt`; do - DIR=`dirname $FILE` - if [ ! -d $BASE/$DIR ]; then - mkdir -p $BASE/$DIR - fi - adb pull /system/$FILE $BASE/$FILE -done - -./setup-makefiles.sh diff --git a/media_a1026.mk b/media_a1026.mk deleted file mode 100644 index e26d144..0000000 --- a/media_a1026.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2009 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 describes the use of the A1026 chip by the media -# framework using system properties. -# -# Note: The property key and value has some length -# limit as defined by PROPERTY_KEY_MAX and -# PROPERTY_VALUE_MAX, respectively -# -# WARNING: We may not use system properties for specifying -# media capabilities and profiles in the future -# -PRODUCT_PROPERTY_OVERRIDES += \ - media.a1026.nsForVoiceRec = 0 \ - media.a1026.enableA1026 = 1 diff --git a/media_htcaudio.mk b/media_htcaudio.mk deleted file mode 100644 index 04d9063..0000000 --- a/media_htcaudio.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2009 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. -# - -PRODUCT_PROPERTY_OVERRIDES += \ - htc.audio.alt.enable=0 \ - htc.audio.hac.enable=0 diff --git a/proprietary-files.txt b/proprietary-files.txt deleted file mode 100644 index 89a6ce7..0000000 --- a/proprietary-files.txt +++ /dev/null @@ -1,50 +0,0 @@ -bin/akmd -bin/bma150_usr -bin/rmt_storage - -etc/AudioBTID.csv -etc/A1026_CFG.csv -etc/AdieHWCodec.csv -etc/AdieHWCodec_WA.csv -etc/firmware/a225p5_pm4.fw -etc/firmware/a225_pm4.fw -etc/firmware/a300_pm4.fw -etc/firmware/leia_pm4_470.fw -etc/firmware/yamato_pm4.fw -etc/firmware/a225_pfp.fw -etc/firmware/a300_pfp.fw -etc/firmware/leia_pfp_470.fw -etc/firmware/yamato_pfp.fw - -lib/egl/eglsubAndroid.so -lib/egl/libEGL_adreno200.so -lib/egl/libGLESv1_CM_adreno200.so -lib/egl/libGLESv2_adreno200.so -lib/egl/libq3dtools_adreno200.so -lib/egl/libGLESv2S3D_adreno200.so -lib/libgsl.so -lib/libsc-a2xx.so -lib/libC2D2.so -lib/libc2d2_z180.so -lib/libOpenVG.so -lib/libaudioalsa.so -lib/libgemini.so -lib/libhtc_acoustic.so -lib/libhtc_ril.so -lib/libmmipl.so -lib/libmmjpeg.so -lib/liboemcamera.so -lib/hw/camera.default.so -lib/libOlaEngine.so -lib/libcameraface.so -lib/libcamerapp.so -lib/libchromatix_s5k4e1gx_default_video.so -lib/libchromatix_s5k4e1gx_preview.so -lib/libwvm.so -lib/libWVStreamControlAPI_L3.so -lib/drm/libdrmwvmplugin.so -lib/libwvdrm_L3.so -lib/libv8.so -lib/libpatts_engine_jni_api.so -lib/libttscompat.so -lib/libposteffect.so diff --git a/setup-makefiles.sh b/setup-makefiles.sh deleted file mode 100755 index 25b7993..0000000 --- a/setup-makefiles.sh +++ /dev/null @@ -1,83 +0,0 @@ -VENDOR=htc -DEVICE=vision -OUTDIR=vendor/$VENDOR/$DEVICE -MAKEFILE=../../../$OUTDIR/$DEVICE-vendor-blobs.mk - -(cat << EOF) > $MAKEFILE -# Copyright (C) 2011 The CyanogenMod 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 generated by device/$VENDOR/$DEVICE/setup-makefiles.sh - -# Prebuilt libraries that are needed to build open-source libraries -PRODUCT_COPY_FILES += \\ - $OUTDIR/proprietary/lib/libaudioalsa.so:obj/lib/libaudioalsa.so - -PRODUCT_COPY_FILES += \\ -EOF - -LINEEND=" \\" -COUNT=`wc -l proprietary-files.txt | awk {'print $1'}` -DISM=`egrep -c '(^#|^$)' proprietary-files.txt` -COUNT=`expr $COUNT - $DISM` -for FILE in `egrep -v '(^#|^$)' proprietary-files.txt`; do - COUNT=`expr $COUNT - 1` - if [ $COUNT = "0" ]; then - LINEEND="" - fi - echo " $OUTDIR/proprietary/$FILE:system/$FILE$LINEEND" >> $MAKEFILE -done - -(cat << EOF) > ../../../$OUTDIR/$DEVICE-vendor.mk -# Copyright (C) 2011 The CyanogenMod 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 generated by device/$VENDOR/$DEVICE/setup-makefiles.sh - -# Pick up overlay for features that depend on non-open-source files -DEVICE_PACKAGE_OVERLAYS := vendor/$VENDOR/$DEVICE/overlay - -\$(call inherit-product, vendor/$VENDOR/$DEVICE/$DEVICE-vendor-blobs.mk) -EOF - -(cat << EOF) > ../../../$OUTDIR/BoardConfigVendor.mk -# Copyright (C) 2011 The CyanogenMod 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 generated by device/$VENDOR/$DEVICE/setup-makefiles.sh -EOF - - diff --git a/system.prop b/system.prop index b58f368..41b2bf1 100644 --- a/system.prop +++ b/system.prop @@ -15,7 +15,7 @@ com.qc.hardware=true ro.gsm.2nd_data_retry_config=max_retries=3, 2000, 2000, 2000 rild.libpath=/system/lib/libhtc_ril.so -ro.telephony.ril.v3=signalstrength,datacallapn,singlepdp +ro.telephony.ril.v3=signalstrength,datacallapn ro.ril.ecc.HTC-GCC=999,112,997 ro.ril.ecc.HTC-WWE=999 diff --git a/vendorsetup.sh b/vendorsetup.sh index 321449b..d1ba6f8 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -1,24 +1 @@ -# -# Copyright (C) 2008 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 executed by build/envsetup.sh, and can use anything -# defined in envsetup.sh. -# -# In particular, you can add lunch options with the add_lunch_combo -# function: add_lunch_combo generic-eng - -add_lunch_combo cm_vision-userdebug add_lunch_combo cm_vision-eng