flo: cleanup the tree

AOSP has abandoned us now, we may as well make things look a bit
prettier.

Change-Id: I09f48ae1b565f05b0ac0ae6bb18a4a2100402e45
This commit is contained in:
Simon Shields 2016-11-15 08:55:25 +11:00
parent 9e259a713d
commit 5bdb6f3606
52 changed files with 302 additions and 637 deletions

View File

@ -1,5 +1,5 @@
#
# Copyright 2012 The Android Open Source Project
# Copyright (C) 2016 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.
@ -13,36 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# This contains the module build definitions for the hardware-specific
# components for this device.
#
# As much as possible, those components should be built unconditionally,
# with device-specific names to avoid collisions, to avoid device-specific
# bitrot and build breakages. Building a component unconditionally does
# *not* include it on all devices, so it is safe even with hardware-specific
# components.
ifneq ($(filter flo deb,$(TARGET_DEVICE)),)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := wpa_supplicant_overlay.conf
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := p2p_supplicant_overlay.conf
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi
include $(BUILD_PREBUILT)
include $(call first-makefiles-under,$(LOCAL_PATH))
include $(call all-makefiles-under,$(LOCAL_PATH))
endif

View File

@ -1,19 +0,0 @@
#
# Copyright 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.
#
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_flo.mk \
$(LOCAL_DIR)/full_flo.mk

4
BoardConfig.mk Executable file → Normal file
View File

@ -18,10 +18,8 @@ TARGET_BOOTLOADER_BOARD_NAME := flo
TARGET_BOOTLOADER_NAME := flo
TARGET_BOARD_INFO_FILE := device/asus/flo/board-info.txt
BOARD_HAL_STATIC_LIBRARIES := libdumpstate.flo
TARGET_RELEASETOOLS_EXTENSIONS := device/asus/flo
TARGET_RECOVERY_FSTAB = device/asus/flo/fstab.flo
TARGET_RECOVERY_FSTAB = device/asus/flo/rootdir/etc/fstab.flo
include device/asus/flo/BoardConfigCommon.mk

0
BoardConfigCommon.mk Executable file → Normal file
View File

View File

@ -1,63 +0,0 @@
# Copyright (C) 2007 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/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, find $(PRODUCT_OUT)/obj/APPS -type f -name "*.apk" -print0 | xargs -0 rm -f)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib/hw/camera.msm8960.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/build.prop)
# Switching to jemalloc requires deleting these files.
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libc_*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libc_*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libart_*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libartd_*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libart_*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libartd_*)

View File

@ -1,32 +0,0 @@
#
# Copyright 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.
#
# Sample: This is where we'd set a backup provider if we had one
# $(call inherit-product, device/sample/products/backup_overlay.mk)
# Inherit from the common Open Source product configuration
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
PRODUCT_NAME := aosp_flo
PRODUCT_DEVICE := flo
PRODUCT_BRAND := Android
PRODUCT_MODEL := AOSP on Flo
PRODUCT_MANUFACTURER := ASUS
# Inherit from hardware-specific part of the product configuration
$(call inherit-product, device/asus/flo/device.mk)
#$(call inherit-product-if-exists, vendor/qcom/proprietary/common/config/device-vendor.mk)

View File

@ -19,14 +19,16 @@ ifneq ($(filter flo deb,$(TARGET_DEVICE)),)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := addrloader.c
LOCAL_C_INCLUDES := \
$(LOCAL_PATH) \
$(TARGET_OUT_HEADERS)/common/inc
$(LOCAL_PATH) \
$(TARGET_OUT_HEADERS)/common/inc
LOCAL_SHARED_LIBRARIES := libcutils liblog
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := qcom
LOCAL_MODULE := bdAddrLoader
include $(BUILD_EXECUTABLE)
endif

7
cm.mk
View File

@ -15,8 +15,11 @@
# Inherit some common CM stuff.
$(call inherit-product, vendor/cm/config/common_mini_tablet_wifionly.mk)
# Inherit device configuration
$(call inherit-product, device/asus/flo/full_flo.mk)
# Inherit from the common Open Source product configuration
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
# Inherit from hardware-specific part of the product configuration
$(call inherit-product, device/asus/flo/device.mk)
## Device identifier. This must come after all inclusions
PRODUCT_DEVICE := flo

View File

@ -14,10 +14,6 @@
# limitations under the License.
#
# This file includes all definitions that apply to ALL msm8960 devices, and
# are also specific to msm8960 devices
#
# Everything in this directory will become public
$(call inherit-product-if-exists, vendor/asus/flo/flo-vendor.mk)
# This device is xhdpi. However the platform doesn't
@ -29,237 +25,183 @@ PRODUCT_AAPT_PREF_CONFIG := xhdpi
# A list of dpis to select prebuilt apk, in precedence order.
PRODUCT_AAPT_PREBUILT_DPI := hdpi
# Audio
PRODUCT_PACKAGES += \
audio.primary.msm8960 \
audio.a2dp.default \
audio.usb.default \
audio.r_submix.default \
libaudio-resampler
PRODUCT_COPY_FILES += \
device/asus/flo/audio/audio_effects.conf:system/vendor/etc/audio_effects.conf \
device/asus/flo/audio/audio_policy.conf:system/etc/audio_policy.conf \
device/asus/flo/audio/mixer_paths.xml:system/etc/mixer_paths.xml
# Bluetooth
PRODUCT_PACKAGES += \
bdAddrLoader \
hci_qcomm_init \
init.flo.bt.sh
# Boot animation
TARGET_SCREEN_HEIGHT := 1920
TARGET_SCREEN_WIDTH := 1200
TARGET_BOOTANIMATION_HALF_RES := true
# Camera
PRODUCT_PACKAGES += \
hostapd \
dhcpcd.conf \
wpa_supplicant \
wpa_supplicant.conf
Snap
# Charger
PRODUCT_PACKAGES += \
lights.msm8960
PRODUCT_PACKAGES += \
charger_res_images
# http://b/15193147
# TODO(danalbert): Remove this once stlport is dead and gone.
PRODUCT_PACKAGES += libstlport
PRODUCT_COPY_FILES += \
device/asus/flo/WCNSS_cfg.dat:system/vendor/firmware/wlan/prima/WCNSS_cfg.dat \
device/asus/flo/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
device/asus/flo/WCNSS_qcom_wlan_nv_flo.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin \
device/asus/flo/WCNSS_qcom_wlan_nv_deb.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin \
device/asus/flo/init.flo.wifi.sh:system/bin/init.flo.wifi.sh
PRODUCT_COPY_FILES += \
device/asus/flo/audio_policy.conf:system/etc/audio_policy.conf
PRODUCT_COPY_FILES += \
device/asus/flo/mixer_paths.xml:system/etc/mixer_paths.xml \
device/asus/flo/sec_config:system/etc/sec_config
PRODUCT_COPY_FILES += \
device/asus/flo/thermald-flo.conf:system/etc/thermald.conf
PRODUCT_COPY_FILES += \
device/asus/flo/init.flo.power.rc:root/init.recovery.flo.rc \
device/asus/flo/init.flo.power.rc:root/init.flo.power.rc \
device/asus/flo/init.flo.usb.rc:root/init.flo.usb.rc \
device/asus/flo/ueventd.flo.rc:root/ueventd.flo.rc \
device/asus/flo/media_profiles.xml:system/etc/media_profiles.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
device/asus/flo/media_codecs.xml:system/etc/media_codecs.xml \
device/asus/flo/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
PRODUCT_COPY_FILES += \
device/asus/flo/kickstart_checker.sh:system/bin/kickstart_checker.sh
# Prebuilt kl and kcm keymaps
PRODUCT_COPY_FILES += \
device/asus/flo/apq8064-tabla-snd-card_Button_Jack.kl:system/usr/keylayout/apq8064-tabla-snd-card_Button_Jack.kl \
device/asus/flo/hs_detect.kl:system/usr/keylayout/hs_detect.kl \
device/asus/flo/pmic8xxx_pwrkey.kl:system/usr/keylayout/pmic8xxx_pwrkey.kl \
device/asus/flo/keypad_8064.kl:system/usr/keylayout/keypad_8064.kl \
device/asus/flo/apq8064-tabla-snd-card_Button_Jack.kcm:system/usr/keychars/apq8064-tabla-snd-card_Button_Jack.kcm \
device/asus/flo/hs_detect.kcm:system/usr/keychars/hs_detect.kcm \
device/asus/flo/keypad_8064.kcm:system/usr/keychars/keypad_8064.kcm \
device/asus/flo/pmic8xxx_pwrkey.kcm:system/usr/keychars/pmic8xxx_pwrkey.kcm
# Prebuilt input device calibration files
PRODUCT_COPY_FILES += \
device/asus/flo/touch_dev.idc:system/usr/idc/touch_dev.idc
# TP idc file
PRODUCT_COPY_FILES += \
device/asus/flo/elan-touchscreen.idc:system/usr/idc/elan-touchscreen.idc
# These are the hardware-specific features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \
frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
# Modem debugger
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
device/asus/flo/init.flo.diag.rc.userdebug:root/init.flo.diag.rc
else
PRODUCT_COPY_FILES += \
device/asus/flo/init.flo.diag.rc.user:root/init.flo.diag.rc
endif
PRODUCT_PROPERTY_OVERRIDES += \
ro.opengles.version=196608
PRODUCT_PROPERTY_OVERRIDES += \
ro.sf.lcd_density=320
# Audio Configuration
PRODUCT_PROPERTY_OVERRIDES += \
persist.audio.handset.mic=dmic \
persist.audio.fluence.mode=endfire \
persist.audio.lowlatency.rec=false
# Camera Configuration
PRODUCT_PROPERTY_OVERRIDES += \
camera.disable_zsl_mode=1
charger_res_images \
charger_touch
# Gello
PRODUCT_PACKAGES += \
Gello
#Enable MDP composition by default
PRODUCT_PROPERTY_OVERRIDES += \
persist.hwc.mdpcomp.enable=true
PRODUCT_CHARACTERISTICS := tablet,nosdcard
Gello
# Graphics
PRODUCT_PACKAGES += \
libgenlock \
hwcomposer.msm8960 \
gralloc.msm8960 \
copybit.msm8960 \
keystore.msm8960 \
memtrack.msm8960
PRODUCT_PACKAGES += \
audio.primary.msm8960 \
audio.a2dp.default \
audio.usb.default \
audio.r_submix.default \
libaudio-resampler
# Voice processing
PRODUCT_PACKAGES += \
libqcomvoiceprocessing \
libqcomvoiceprocessingdescriptors
PRODUCT_COPY_FILES += \
device/asus/flo/audio_effects.conf:system/vendor/etc/audio_effects.conf
# Monitor device rotation for speaker channel swap
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.monitorRotation=true
PRODUCT_PACKAGES += \
hci_qcomm_init
PRODUCT_COPY_FILES += \
device/asus/flo/init.flo.bt.sh:system/bin/init.flo.bt.sh
PRODUCT_PROPERTY_OVERRIDES += \
ro.qualcomm.bt.hci_transport=smd
PRODUCT_PACKAGES += \
Snap
PRODUCT_PACKAGES += \
libOmxVdec \
libOmxVenc \
libOmxCore \
libstagefrighthw
libgenlock \
hwcomposer.msm8960 \
gralloc.msm8960 \
copybit.msm8960 \
memtrack.msm8960
# GPS
PRODUCT_PACKAGES += \
gps.conf \
gps.msm8960
gps.conf \
gps.msm8960
# IPC router config
PRODUCT_COPY_FILES += \
device/asus/flo/configs/sec_config:system/etc/sec_config
# Keylayouts
PRODUCT_COPY_FILES += \
device/asus/flo/keylayout/apq8064-tabla-snd-card_Button_Jack.kl:system/usr/keylayout/apq8064-tabla-snd-card_Button_Jack.kl \
device/asus/flo/keylayout/hs_detect.kl:system/usr/keylayout/hs_detect.kl \
device/asus/flo/keylayout/pmic8xxx_pwrkey.kl:system/usr/keylayout/pmic8xxx_pwrkey.kl \
device/asus/flo/keylayout/keypad_8064.kl:system/usr/keylayout/keypad_8064.kl \
device/asus/flo/keylayout/apq8064-tabla-snd-card_Button_Jack.kcm:system/usr/keychars/apq8064-tabla-snd-card_Button_Jack.kcm \
device/asus/flo/keylayout/hs_detect.kcm:system/usr/keychars/hs_detect.kcm \
device/asus/flo/keylayout/keypad_8064.kcm:system/usr/keychars/keypad_8064.kcm \
device/asus/flo/keylayout/pmic8xxx_pwrkey.kcm:system/usr/keychars/pmic8xxx_pwrkey.kcm
# Keystore
PRODUCT_PACKAGES += \
bdAddrLoader \
libwfcu \
conn_init \
charger_touch
keystore.msm8960
# Kickstart
PRODUCT_COPY_FILES += \
device/asus/flo/kickstart_checker.sh:system/bin/kickstart_checker.sh
# Lights
PRODUCT_PACKAGES += \
wpa_supplicant_overlay.conf \
p2p_supplicant_overlay.conf
lights.msm8960
PRODUCT_PROPERTY_OVERRIDES += \
drm.service.enabled=true
# Media
PRODUCT_COPY_FILES += \
device/asus/flo/configs/media_profiles.xml:system/etc/media_profiles.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
device/asus/flo/configs/media_codecs.xml:system/etc/media_codecs.xml \
device/asus/flo/configs/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
PRODUCT_PROPERTY_OVERRIDES += \
wifi.interface=wlan0
# Enable AAC 5.1 output
PRODUCT_PROPERTY_OVERRIDES += \
media.aac_51_output_enabled=true
PRODUCT_PROPERTY_OVERRIDES += \
debug.egl.recordable.rgba8888=1
PRODUCT_PROPERTY_OVERRIDES += \
ro.qc.sensors.wl_dis=true \
ro.qualcomm.sensors.smd=true
# Configure libhwui
PRODUCT_PROPERTY_OVERRIDES += \
ro.hwui.texture_cache_size=48 \
ro.hwui.layer_cache_size=32 \
ro.hwui.r_buffer_cache_size=4 \
ro.hwui.path_cache_size=24 \
ro.hwui.gradient_cache_size=1 \
ro.hwui.drop_shadow_cache_size=5 \
ro.hwui.texture_cache_flushrate=0.5 \
ro.hwui.text_small_cache_width=1024 \
ro.hwui.text_small_cache_height=1024 \
ro.hwui.text_large_cache_width=2048 \
ro.hwui.text_large_cache_height=1024
PRODUCT_PROPERTY_OVERRIDES += \
dalvik.vm.dex2oat-swap=false
# Misc
PRODUCT_CHARACTERISTICS := tablet,nosdcard
# NFC
PRODUCT_PACKAGES += \
power.flo
# NFC packages
PRODUCT_PACKAGES += \
nfc_nci.bcm2079x.default \
libnfc-nci \
libnfc_nci_jni \
NfcNci \
Tag
PRODUCT_COPY_FILES += \
device/asus/flo/configs/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
device/asus/flo/configs/nfc/libnfc-brcm-20791b05.conf:system/etc/libnfc-brcm-20791b05.conf
# OMX
PRODUCT_PACKAGES += \
libOmxVdec \
libOmxVenc \
libOmxCore \
libstagefrighthw
# Permissions/features
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \
frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
frameworks/native/data/etc/android.hardware.location.gps.xml:system/etc/permissions/android.hardware.location.gps.xml \
frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml \
frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \
frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \
device/asus/flo/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
device/asus/flo/nfc/libnfc-brcm-20791b05.conf:system/etc/libnfc-brcm-20791b05.conf
frameworks/native/data/etc/android.software.midi.xml:system/etc/permissions/android.software.midi.xml
# Power
PRODUCT_PACKAGES += \
power.flo
# Ramdisk
PRODUCT_PACKAGES += \
fstab.flo \
init.flo.rc \
init.flo.power.rc \
init.flo.usb.rc \
init.recovery.flo.rc \
ueventd.rc \
ueventd.flo.rc
# stlport
PRODUCT_PACKAGES += \
libstlport
# Thermal
PRODUCT_COPY_FILES += \
device/asus/flo/configs/thermald-flo.conf:system/etc/thermald.conf
# Touchscreen calibration
PRODUCT_COPY_FILES += \
device/asus/flo/configs/touch_dev.idc:system/usr/idc/touch_dev.idc \
device/asus/flo/configs/elan-touchscreen.idc:system/usr/idc/elan-touchscreen.idc
# Wifi
PRODUCT_PACKAGES += \
conn_init \
dhcpcd.conf \
hostapd \
libwfcu \
p2p_supplicant_overlay.conf \
wpa_supplicant \
wpa_supplicant.conf \
wpa_supplicant_overlay.conf \
init.flo.wifi.sh
PRODUCT_COPY_FILES += \
device/asus/flo/wifi/WCNSS_cfg.dat:system/vendor/firmware/wlan/prima/WCNSS_cfg.dat \
device/asus/flo/wifi/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
device/asus/flo/wifi/WCNSS_qcom_wlan_nv_flo.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin \
device/asus/flo/wifi/WCNSS_qcom_wlan_nv_deb.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin
# Voice processing
PRODUCT_PACKAGES += \
libqcomvoiceprocessing \
libqcomvoiceprocessingdescriptors
# Dalvik/HWUI
$(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk)

View File

@ -14,25 +14,13 @@
# limitations under the License.
#
# This file includes all definitions that apply to ALL msm8960 devices, and
# are also specific to msm8960 devices
#
# Everything in this directory will become public
PRODUCT_PROPERTY_OVERRIDES := \
ro.carrier=wifi-only
PRODUCT_COPY_FILES += \
device/asus/flo/fstab.flo:root/fstab.flo \
device/asus/flo/init.flo.rc:root/init.flo.rc
# Camera
PRODUCT_PACKAGES += \
camera.flo
# NFC
PRODUCT_PACKAGES += \
nfc_nci.bcm2079x.default
# the actual meat of the device-specific product definition
$(call inherit-product, device/asus/flo/device-common.mk)

View File

@ -1,190 +0,0 @@
Copyright (C) 2011 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.
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.
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS

View File

@ -1,39 +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.
*/
#include <dumpstate.h>
void dump_ks_bridges()
{
int i;
for (i = 1; i <= 4; ++i) {
char path[64], title[32];
sprintf(path, "/sys/kernel/debug/ks_bridge/ks_bridge:%d", i);
sprintf(title, "KS BRIDGE LOG#%d", i);
dump_file(title, path);
}
}
void dumpstate_board()
{
dump_file("INTERRUPTS", "/proc/interrupts");
dump_ks_bridges();
dump_file("eMMC manfid",
"/sys/devices/platform/msm_sdcc.1/mmc_host/mmc0/mmc0:0001/manfid");
dump_file("eMMC capacity",
"/sys/devices/platform/msm_sdcc.1/mmc_host/mmc0/mmc0:0001/sec_count");
dump_file("Touch firmware version", "/sys/class/switch/touch/name");
};

View File

@ -1,18 +0,0 @@
#
# Copyright 2013 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.
#
$(call inherit-product, device/asus/flo/aosp_flo.mk)
PRODUCT_NAME := full_flo

View File

@ -1,4 +0,0 @@
# This file gets copied as /init.flo.diag.rc
on post-fs-data
rm /dev/diag

View File

@ -1,6 +0,0 @@
# This file gets copied as /init.flo.diag.rc
on post-fs-data
# Modem logging collection
mkdir /data/diag_logs 0777 system system
chmod 666 /dev/diag

76
rootdir/Android.mk Normal file
View File

@ -0,0 +1,76 @@
LOCAL_PATH := $(call my-dir)
# Device init scripts
ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),flo)
# deb also has fstab.flo and init.flo.rc
include $(CLEAR_VARS)
LOCAL_MODULE := fstab.flo
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/fstab.flo
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := init.flo.rc
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.flo.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
endif
include $(CLEAR_VARS)
LOCAL_MODULE := init.flo.power.rc
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.flo.power.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := init.recovery.flo.rc
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.flo.power.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := init.flo.usb.rc
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.flo.usb.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := ueventd.flo.rc
LOCAL_MODULE_TAGS := optional eng
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/ueventd.flo.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
# Bluetooth/Wifi config scripts
include $(CLEAR_VARS)
LOCAL_MODULE := init.flo.bt.sh
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.flo.bt.sh
LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := init.flo.wifi.sh
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.flo.wifi.sh
LOCAL_MODULE_PATH := $(TARGET_OUT)/bin
include $(BUILD_PREBUILT)

View File

@ -16,7 +16,6 @@
import init.flo.power.rc
import init.flo.usb.rc
import init.flo.diag.rc
on early-init
mount debugfs debugfs /sys/kernel/debug

View File

@ -1,2 +1,48 @@
# Bluetooth
qcom.bluetooth.soc=smd
ro.qualcomm.bt.hci_transport=smd
# Audio
# Monitor device rotation for speaker channel swap
ro.audio.monitorRotation=true
# Enable AAC 5.1 output
media.aac_51_output_enabled=true
persist.audio.handset.mic=dmic
persist.audio.fluence.mode=endfire
persist.audio.lowlatency.rec=false
# Camera
camera.disable_zsl_mode=1
# DRM
drm.service.enabled=true
# Wifi
wifi.interface=wlan0
# Sensors
ro.qc.sensors.wl_dis=true
ro.qualcomm.sensors.smd=true
# libhwui
ro.hwui.texture_cache_size=48
ro.hwui.layer_cache_size=32
ro.hwui.r_buffer_cache_size=4
ro.hwui.path_cache_size=24
ro.hwui.gradient_cache_size=1
ro.hwui.drop_shadow_cache_size=5
ro.hwui.texture_cache_flushrate=0.5
ro.hwui.text_small_cache_width=1024
ro.hwui.text_small_cache_height=1024
ro.hwui.text_large_cache_width=2048
ro.hwui.text_large_cache_height=1024
# Dalvik/ART
dalvik.vm.dex2oat-swap=false
# Graphics
ro.opengles.version=196608
ro.sf.lcd_density=320
# Display
persist.hwc.mdpcomp.enable=true

View File

@ -5,10 +5,10 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
voice_processing_descriptors.c
voice_processing_descriptors.c
LOCAL_C_INCLUDES += \
$(call include-path-for, audio-effects)
$(call include-path-for, audio-effects)
LOCAL_MODULE := libqcomvoiceprocessingdescriptors
@ -18,4 +18,4 @@ LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
endif
endif

View File

@ -1,4 +1,5 @@
# Copyright (C) 2011 The Android Open Source Project
#
# Copyright (C) 2016 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.
@ -11,16 +12,23 @@
# 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.
#
LOCAL_PATH := $(call my-dir)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := wpa_supplicant_overlay.conf
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi
include $(BUILD_PREBUILT)
LOCAL_C_INCLUDES := frameworks/native/cmds/dumpstate
include $(CLEAR_VARS)
LOCAL_MODULE := p2p_supplicant_overlay.conf
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi
include $(BUILD_PREBUILT)
LOCAL_SRC_FILES := dumpstate.cpp
LOCAL_MODULE := libdumpstate.flo
LOCAL_MODULE_TAGS := optional
include $(BUILD_STATIC_LIBRARY)