Piteball
/
android_device_asus_flo
mirror of https://github.com/followmsi/android_device_asus_flo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flox: Rebrand from flo 

* We need to repartition, and therefore are unable to support
  upgrades from previous versions, hence, rebrand.

Change-Id: Iefda75e85685c830d30403403061233a048c09d3
This commit is contained in:
Nolen Johnson 2020-10-25 22:12:49 -04:00
parent e5b73738f5
commit ffe073b545
35 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
ifneq ($(filter flo deb,$(TARGET_DEVICE)),)
ifneq ($(filter flox debx,$(TARGET_DEVICE)),)
LOCAL_PATH := $(call my-dir)

2
AndroidProducts.mk
View File

@ -1,2 +1,2 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/lineage_flo.mk
$(LOCAL_DIR)/lineage_flox.mk

2
BoardConfig.mk
View File

@ -14,7 +14,7 @@
# limitations under the License.
#
DEVICE_PATH := device/asus/flo
DEVICE_PATH := device/asus/flox
TARGET_BOOTLOADER_BOARD_NAME := flo
TARGET_BOOTLOADER_NAME := flo

4
BoardConfigCommon.mk
View File

@ -26,7 +26,7 @@ BOARD_KERNEL_BASE := 0x80200000
BOARD_KERNEL_IMAGE_NAME = zImage
BOARD_KERNEL_PAGESIZE := 2048
# BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.hardware=msm8960 maxcpus=2
BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.hardware=flo user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3
BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.hardware=flox user_debug=31 msm_rtb.filter=0x3F ehci-hcd.park=3
BOARD_KERNEL_CMDLINE += vmalloc=340M
BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x02000000
TARGET_KERNEL_SOURCE := kernel/google/msm
@ -152,4 +152,4 @@ TARGET_RECOVERY_DENSITY := hdpi
DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
DEVICE_MATRIX_FILE := $(DEVICE_PATH)/compatibility_matrix.xml
-include vendor/asus/flo/BoardConfigVendor.mk
-include vendor/asus/flox/BoardConfigVendor.mk

2
bdAddrLoader/Android.mk
View File

@ -14,7 +14,7 @@
# limitations under the License.
#
ifneq ($(filter flo deb,$(TARGET_DEVICE)),)
ifneq ($(filter flox debx,$(TARGET_DEVICE)),)
LOCAL_PATH:= $(call my-dir)

2
camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
View File

@ -15,7 +15,7 @@ LOCAL_CFLAGS += -DUSE_ION
endif
OMX_HEADER_DIR := frameworks/native/include/media/openmax
OMX_CORE_DIR := device/asus/flo/camera/mm-image-codec
OMX_CORE_DIR := device/asus/flox/camera/mm-image-codec
LOCAL_C_INCLUDES := $(MM_JPEG_TEST_PATH)
LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc

2
charger_touch/Android.mk
View File

@ -14,7 +14,7 @@
# limitations under the License.
#
ifneq ($(filter flo deb,$(TARGET_DEVICE)),)
ifneq ($(filter flox debx,$(TARGET_DEVICE)),)
LOCAL_PATH:= $(call my-dir)

0
configs/thermald-flo.conf → configs/thermald-flox.conf
View File

2
conn_init/Android.mk
View File

@ -14,7 +14,7 @@
# limitations under the License.
#
ifneq ($(filter flo deb,$(TARGET_DEVICE)),)
ifneq ($(filter flox debx,$(TARGET_DEVICE)),)
LOCAL_PATH:= $(call my-dir)

6
conn_init/wfc_util_qcom.c
View File

@ -551,12 +551,12 @@ int wfc_util_qcom_check_config(unsigned char *nv_mac_addr)
char nv_bin_tempfile_name[50];
char baseband[PROPERTY_VALUE_MAX];
// Default use WCNSS_qcom_wlan_nv_flo.bin
// Default use WCNSS_qcom_wlan_nv_flox.bin
property_get("ro.boot.baseband", baseband, "apq");
if(!strncmp(baseband, "apq", 3)) {
sprintf(nv_bin_tempfile_name, "/vendor/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin");
sprintf(nv_bin_tempfile_name, "/vendor/etc/wifi/WCNSS_qcom_wlan_nv_flox.bin");
} else if( !strncmp(baseband, "mdm", 3)){
sprintf(nv_bin_tempfile_name, "/vendor/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin");
sprintf(nv_bin_tempfile_name, "/vendor/etc/wifi/WCNSS_qcom_wlan_nv_debx.bin");
}
wfc_util_log_error("nv bin : %s", nv_bin_tempfile_name);

24
device-common.mk
View File

@ -14,7 +14,7 @@
# limitations under the License.
#
$(call inherit-product-if-exists, vendor/asus/flo/flo-vendor.mk)
$(call inherit-product-if-exists, vendor/asus/flox/flox-vendor.mk)
# This device is xhdpi. However the platform doesn't
# currently contain all of the bitmaps at xhdpi density so
@ -55,7 +55,7 @@ PRODUCT_PACKAGES += \
hci_qcomm_init
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/rootdir/etc/init.flo.bt.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.flo.bt.sh
$(LOCAL_PATH)/rootdir/etc/init.flox.bt.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.flox.bt.sh
# Bluetooth HAL
PRODUCT_PACKAGES += \
@ -196,16 +196,16 @@ PRODUCT_COPY_FILES += \
# Power
PRODUCT_PACKAGES += \
android.hardware.power@1.0-impl \
power.flo
power.flox
# Ramdisk
PRODUCT_PACKAGES += \
fstab.flo \
init.flo.rc \
init.flo.power.rc \
init.flo.usb.rc \
fstab.flox \
init.flox.rc \
init.flox.power.rc \
init.flox.usb.rc \
ueventd.rc \
ueventd.flo.rc
ueventd.flox.rc
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/rootdir/etc/init.qcom.devwait.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qcom.devwait.sh \
@ -226,7 +226,7 @@ PRODUCT_PACKAGES += \
# Thermal
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/thermald-flo.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermald.conf
$(LOCAL_PATH)/configs/thermald-flox.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermald.conf
# Touchscreen calibration
PRODUCT_COPY_FILES += \
@ -249,11 +249,11 @@ PRODUCT_PACKAGES += \
wpa_supplicant.conf
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/rootdir/etc/init.flo.wifi.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.flo.wifi.sh \
$(LOCAL_PATH)/rootdir/etc/init.flox.wifi.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.flox.wifi.sh \
$(LOCAL_PATH)/wifi/WCNSS_cfg.dat:$(TARGET_COPY_OUT_VENDOR)/firmware/wlan/prima/WCNSS_cfg.dat \
$(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \
$(LOCAL_PATH)/wifi/WCNSS_qcom_wlan_nv_flo.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin \
$(LOCAL_PATH)/wifi/WCNSS_qcom_wlan_nv_deb.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin \
$(LOCAL_PATH)/wifi/WCNSS_qcom_wlan_nv_flox.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_wlan_nv_flox.bin \
$(LOCAL_PATH)/wifi/WCNSS_qcom_wlan_nv_debx.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_wlan_nv_debx.bin \
$(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \
$(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf

6
device.mk
View File

@ -19,7 +19,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
# Camera
PRODUCT_PACKAGES += \
camera.flo
camera.flox
# the actual meat of the device-specific product definition
$(call inherit-product, $(LOCAL_PATH)/device-common.mk)
@ -33,5 +33,5 @@ PRODUCT_ENFORCE_RRO_TARGETS := \
framework-res
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/rootdir/etc/fstab.flo:$(TARGET_COPY_OUT_RAMDISK)/fstab.flo \
$(LOCAL_PATH)/rootdir/etc/fstab.flo:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.flo
$(LOCAL_PATH)/rootdir/etc/fstab.flox:$(TARGET_COPY_OUT_RAMDISK)/fstab.flox \
$(LOCAL_PATH)/rootdir/etc/fstab.flox:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.flox

4
extract-files.sh
View File

@ -18,8 +18,8 @@
set -e
VENDOR=asus
DEVICE_COMMON=flo
DEVICE=${DEVICE:-flo}
DEVICE_COMMON=flox
DEVICE=${DEVICE:-flox}
# Load extractutils and do some sanity checks
MY_DIR="${BASH_SOURCE%/*}"

4
lineage_flo.mk → lineage_flox.mk
View File

@ -22,8 +22,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
$(call inherit-product, $(LOCAL_PATH)/device.mk)
## Device identifier. This must come after all inclusions
PRODUCT_DEVICE := flo
PRODUCT_NAME := lineage_flo
PRODUCT_DEVICE := flox
PRODUCT_NAME := lineage_flox
PRODUCT_BRAND := google
PRODUCT_MODEL := Nexus 7
PRODUCT_MANUFACTURER := asus

4
power/Android.mk
View File

@ -18,9 +18,9 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := power_flo.c
LOCAL_SRC_FILES := power_flox.c
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := power.flo
LOCAL_MODULE := power.flox
LOCAL_PROPRIETARY_MODULE := true
include $(BUILD_SHARED_LIBRARY)

0
power/power_flo.c → power/power_flox.c
View File

2
proprietary-blobs.txt
View File

@ -56,7 +56,7 @@ vendor/lib/egl/libGLESv2_adreno.so
vendor/lib/egl/libplayback_adreno.so
vendor/lib/egl/libq3dtools_adreno.so
lib/hw/flp.msm8960.so:vendor/lib/hw/flp.msm8960.so
lib/hw/sensors.msm8960.so:vendor/lib/sensors.flo.so
lib/hw/sensors.msm8960.so:vendor/lib/sensors.flox.so
lib/libacdbdata.so:vendor/lib/libacdbdata.so
lib/libacdbloader.so:vendor/lib/libacdbloader.so
vendor/lib/libadreno_utils.so

2
recovery/root/init.recovery.flo.rc → recovery/root/init.recovery.flox.rc
View File

@ -1,4 +1,4 @@
import /init.recovery.flo.usb.rc
import /init.recovery.flox.usb.rc
on enable-low-power
# Enable Power modes and set the CPU Freq Sampling rates

0
recovery/root/init.recovery.flo.usb.rc → recovery/root/init.recovery.flox.usb.rc
View File

22
rootdir/Android.mk
View File

@ -3,45 +3,45 @@ LOCAL_PATH := $(call my-dir)
# Device init scripts
ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),flo)
# deb also has fstab.flo and init.flo.rc
# deb also has fstab.flox and init.flox.rc
include $(CLEAR_VARS)
LOCAL_MODULE := fstab.flo
LOCAL_MODULE := fstab.flox
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/fstab.flo
LOCAL_SRC_FILES := etc/fstab.flox
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := init.flo.rc
LOCAL_MODULE := init.flox.rc
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.flo.rc
LOCAL_SRC_FILES := etc/init.flox.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
endif
include $(CLEAR_VARS)
LOCAL_MODULE := init.flo.power.rc
LOCAL_MODULE := init.flox.power.rc
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.flo.power.rc
LOCAL_SRC_FILES := etc/init.flox.power.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := init.flo.usb.rc
LOCAL_MODULE := init.flox.usb.rc
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/init.flo.usb.rc
LOCAL_SRC_FILES := etc/init.flox.usb.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := ueventd.flo.rc
LOCAL_MODULE := ueventd.flox.rc
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_SRC_FILES := etc/ueventd.flo.rc
LOCAL_SRC_FILES := etc/ueventd.flox.rc
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)

0
rootdir/etc/fstab.flo → rootdir/etc/fstab.flox
View File

0
rootdir/etc/init.flo.bt.sh → rootdir/etc/init.flox.bt.sh
View File

0
rootdir/etc/init.flo.power.rc → rootdir/etc/init.flox.power.rc
View File

12
rootdir/etc/init.flo.rc → rootdir/etc/init.flox.rc
View File

@ -14,8 +14,8 @@
# limitations under the License.
#
import init.flo.power.rc
import init.flo.usb.rc
import init.flox.power.rc
import init.flox.usb.rc
on early-init
mount debugfs debugfs /sys/kernel/debug
@ -31,7 +31,7 @@ on init
symlink /sdcard /storage/sdcard0
on fs
mount_all ./fstab.flo --early
mount_all ./fstab.flox --early
restorecon_recursive /persist
# GnssConfiguration doesn't actually look at gps.conf, just the debug file
@ -47,7 +47,7 @@ on late-fs
start bootanim
start vendor.gralloc-2-0
mount_all ./fstab.flo --late
mount_all ./fstab.flox --late
on early-boot
# set RLIMIT_MEMLOCK to 64MB
@ -257,7 +257,7 @@ service rmt_storage /vendor/bin/rmt_storage
user root
group system wakelock
service hciattach /vendor/bin/init.flo.bt.sh
service hciattach /vendor/bin/init.flox.bt.sh
class late_start
user bluetooth
group bluetooth system
@ -355,7 +355,7 @@ service qcamerasvr /vendor/bin/mm-qcamera-daemon
user camera
group camera system inet input
service wcnss_init /vendor/bin/init.flo.wifi.sh
service wcnss_init /vendor/bin/init.flox.wifi.sh
class late_start
user system
group system wifi

0
rootdir/etc/init.flo.usb.rc → rootdir/etc/init.flox.usb.rc
View File

0
rootdir/etc/init.flo.wifi.sh → rootdir/etc/init.flox.wifi.sh
View File

0
rootdir/etc/ueventd.flo.rc → rootdir/etc/ueventd.flox.rc
View File

2
sensors/sensors_wrapper.cpp
View File

@ -21,7 +21,7 @@
#include <errno.h>
// The "real" sensor lib to wrap around
#define SENSOR_LIB "sensors.flo.so"
#define SENSOR_LIB "sensors.flox.so"
// Enable experimental flush support
#define FLUSH_SUPPORT

10
sepolicy/bluetooth_loader.te
View File

@ -1,15 +1,15 @@
# Bluetooth executables and script (bdAddrLoader, init.flo.bt.sh)
# Bluetooth executables and script (bdAddrLoader, init.flox.bt.sh)
# type bluetooth_loader, domain, device_domain_deprecated;
# type bluetooth_loader_exec, exec_type, file_type;
# Run init.flo.bt.sh
# Run init.flox.bt.sh
allow bluetooth_loader shell_exec:file rx_file_perms;
allow bluetooth_loader bluetooth_loader_exec:file rx_file_perms;
# init.flo.bt.sh needs /system/bin/log access
# init.flox.bt.sh needs /system/bin/log access
allow bluetooth_loader devpts:chr_file rw_file_perms;
# Run hci_qcomm_init from init.flo.bt.sh
# Run hci_qcomm_init from init.flox.bt.sh
domain_auto_trans(bluetooth_loader, hci_attach_exec, hci_attach)
allow hci_attach bluetooth_loader:fd use;
@ -21,6 +21,6 @@ r_dir_file(bluetooth_loader, persist_bluetooth_file)
set_prop(bluetooth, bluetooth_prop)
set_prop(bluetooth_loader, bluetooth_prop)
# Allow getprop/setprop for init.flo.bt.sh
# Allow getprop/setprop for init.flox.bt.sh
allow bluetooth_loader system_file:file execute_no_trans;
allow bluetooth_loader toolbox_exec:file rx_file_perms;

4
sepolicy/conn_init.te
View File

@ -4,7 +4,7 @@ type conn_init_exec, exec_type, file_type;
init_daemon_domain(conn_init)
# Runs init.flo.wifi.sh
# Runs init.flox.wifi.sh
allow conn_init shell_exec:file rx_file_perms;
allow conn_init conn_init_exec:file rx_file_perms;
@ -18,7 +18,7 @@ allow conn_init wifi_data_file:file create_file_perms;
allow conn_init wlan_device:chr_file rw_file_perms;
# init.flo.wifi.sh runs toolbox
# init.flox.wifi.sh runs toolbox
allow conn_init system_file:file execute_no_trans;
allow conn_init toolbox_exec:file rx_file_perms;

4
sepolicy/file_contexts
View File

@ -76,9 +76,9 @@
/system/vendor/bin/mm-qcamera-daemon u:object_r:camera_exec:s0
/system/vendor/bin/qseecomd u:object_r:tee_exec:s0
/system/vendor/bin/conn_init u:object_r:conn_init_exec:s0
/system/vendor/bin/init\.flo\.wifi\.sh u:object_r:conn_init_exec:s0
/system/vendor/bin/init\.flox\.wifi\.sh u:object_r:conn_init_exec:s0
/system/vendor/bin/irsc_util u:object_r:irsc_util_exec:s0
/system/vendor/bin/init\.flo\.bt\.sh u:object_r:bluetooth_loader_exec:s0
/system/vendor/bin/init\.flox\.bt\.sh u:object_r:bluetooth_loader_exec:s0
/system/vendor/bin/init\.qcom\.devstart\.sh u:object_r:init-qcom-devstart-sh_exec:s0
/system/vendor/bin/init\.qcom\.devwait\.sh u:object_r:init-qcom-devwait-sh_exec:s0

6
setup-makefiles.sh
View File

@ -18,8 +18,8 @@
set -e
VENDOR=asus
DEVICE_COMMON=flo
DEVICE=${DEVICE:-flo}
DEVICE_COMMON=flox
DEVICE=${DEVICE:-flox}
export INITIAL_COPYRIGHT_YEAR=2013
# Load extractutils and do some sanity checks
@ -39,7 +39,7 @@ fi
setup_vendor "$DEVICE_COMMON" "$VENDOR" "$CM_ROOT" true
# Copyright headers and guards
write_headers "flo deb"
write_headers "flox debx"
# The standard blobs
write_makefiles "$MY_DIR"/proprietary-blobs.txt

2
voice_processing/Android.mk
View File

@ -1,4 +1,4 @@
ifneq ($(filter flo deb,$(TARGET_DEVICE)),)
ifneq ($(filter flox debx,$(TARGET_DEVICE)),)
LOCAL_PATH:= $(call my-dir)

0
wifi/WCNSS_qcom_wlan_nv_deb.bin → wifi/WCNSS_qcom_wlan_nv_debx.bin
View File

0
wifi/WCNSS_qcom_wlan_nv_flo.bin → wifi/WCNSS_qcom_wlan_nv_flox.bin
View File