flocaf: Adopt it for CAF device tree structure

Change-Id: I5930ed0e86fcfc8fb79297eecb8cdc967fefd82c

7 files changed, 46 insertions, 46 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 420bf13..08c6bdf 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -16,13 +16,13 @@
 
 TARGET_BOOTLOADER_BOARD_NAME := flo
 TARGET_BOOTLOADER_NAME := flo
-TARGET_BOARD_INFO_FILE := device/asus/flo/board-info.txt
+TARGET_BOARD_INFO_FILE := device/asus/flocaf/board-info.txt
 
 BOARD_HAL_STATIC_LIBRARIES := libdumpstate.flo
 
-TARGET_RELEASETOOLS_EXTENSIONS := device/asus/flo
+TARGET_RELEASETOOLS_EXTENSIONS := device/asus/flocaf
 
-TARGET_RECOVERY_FSTAB = device/asus/flo/fstab.flo
+TARGET_RECOVERY_FSTAB = device/asus/flocaf/fstab.flo
 
 -include vendor/asus/flo/BoardConfigVendor.mk
-include device/asus/flo/BoardConfigCommon.mk
+include device/asus/flocaf/BoardConfigCommon.mk
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 8b3e458..8a997ef 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -44,7 +44,7 @@ BLUETOOTH_HCI_USE_MCT := true
 TARGET_NO_RADIOIMAGE := true
 TARGET_BOARD_PLATFORM := msm8960
 
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/asus/flo/bluetooth
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/asus/flocaf/bluetooth
 
 # FIXME: HOSTAPD-derived wifi driver
 BOARD_HAS_QCOM_WLAN := true
@@ -116,7 +116,7 @@ USE_DEVICE_SPECIFIC_CAMERA:= true
 
 HAVE_ADRENO_SOURCE:= false
 
-BOARD_SEPOLICY_DIRS += device/asus/flo/sepolicy
+BOARD_SEPOLICY_DIRS += device/asus/flocaf/sepolicy
 
 # Enable Minikin text layout engine (will be the default soon)
 USE_MINIKIN := true
diff --git a/aosp_flo.mk b/aosp_flo.mk
index 95ece20..040dcd0 100644
--- a/aosp_flo.mk
+++ b/aosp_flo.mk
@@ -28,6 +28,6 @@ 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, device/asus/flocaf/device.mk)
 $(call inherit-product-if-exists, vendor/asus/flo/device-vendor.mk)
 #$(call inherit-product-if-exists, vendor/qcom/proprietary/common/config/device-vendor.mk)
diff --git a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
index 03f2f80..86cb004 100644
--- a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
+++ b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
@@ -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/flocaf/camera/mm-image-codec
 
 LOCAL_C_INCLUDES := $(MM_JPEG_TEST_PATH)
 LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc
diff --git a/device-common.mk b/device-common.mk
index 9eb2c6e..ac07fd3 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -45,54 +45,54 @@ PRODUCT_PACKAGES += \
         librs_jni
 
 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
+	device/asus/flocaf/WCNSS_cfg.dat:system/vendor/firmware/wlan/prima/WCNSS_cfg.dat \
+	device/asus/flocaf/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \
+	device/asus/flocaf/WCNSS_qcom_wlan_nv_flo.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_flo.bin \
+	device/asus/flocaf/WCNSS_qcom_wlan_nv_deb.bin:system/etc/wifi/WCNSS_qcom_wlan_nv_deb.bin \
+	device/asus/flocaf/init.flo.wifi.sh:system/bin/init.flo.wifi.sh
 
 PRODUCT_COPY_FILES += \
-	device/asus/flo/audio_policy.conf:system/etc/audio_policy.conf
+	device/asus/flocaf/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
+	device/asus/flocaf/mixer_paths.xml:system/etc/mixer_paths.xml \
+	device/asus/flocaf/sec_config:system/etc/sec_config
 
 PRODUCT_COPY_FILES += \
-	device/asus/flo/thermald-flo.conf:system/etc/thermald.conf
+	device/asus/flocaf/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 \
+	device/asus/flocaf/init.flo.power.rc:root/init.recovery.flo.rc \
+	device/asus/flocaf/init.flo.power.rc:root/init.flo.power.rc \
+	device/asus/flocaf/init.flo.usb.rc:root/init.flo.usb.rc \
+	device/asus/flocaf/ueventd.flo.rc:root/ueventd.flo.rc \
+	device/asus/flocaf/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
+	device/asus/flocaf/media_codecs.xml:system/etc/media_codecs.xml \
+	device/asus/flocaf/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
 
 PRODUCT_COPY_FILES += \
-	device/asus/flo/kickstart_checker.sh:system/bin/kickstart_checker.sh
+	device/asus/flocaf/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
+	device/asus/flocaf/apq8064-tabla-snd-card_Button_Jack.kl:system/usr/keylayout/apq8064-tabla-snd-card_Button_Jack.kl \
+	device/asus/flocaf/hs_detect.kl:system/usr/keylayout/hs_detect.kl \
+	device/asus/flocaf/pmic8xxx_pwrkey.kl:system/usr/keylayout/pmic8xxx_pwrkey.kl \
+	device/asus/flocaf/keypad_8064.kl:system/usr/keylayout/keypad_8064.kl \
+	device/asus/flocaf/apq8064-tabla-snd-card_Button_Jack.kcm:system/usr/keychars/apq8064-tabla-snd-card_Button_Jack.kcm \
+	device/asus/flocaf/hs_detect.kcm:system/usr/keychars/hs_detect.kcm \
+	device/asus/flocaf/keypad_8064.kcm:system/usr/keychars/keypad_8064.kcm \
+	device/asus/flocaf/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
+	device/asus/flocaf/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
+	device/asus/flocaf/elan-touchscreen.idc:system/usr/idc/elan-touchscreen.idc
 
 # These are the hardware-specific features
 PRODUCT_COPY_FILES += \
@@ -115,10 +115,10 @@ PRODUCT_COPY_FILES += \
 # 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
+    device/asus/flocaf/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
+    device/asus/flocaf/init.flo.diag.rc.user:root/init.flo.diag.rc
 endif
 
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -179,7 +179,7 @@ PRODUCT_PACKAGES += \
     libqcomvoiceprocessing \
     libqcomvoiceprocessingdescriptors
 PRODUCT_COPY_FILES += \
-    device/asus/flo/audio_effects.conf:system/vendor/etc/audio_effects.conf
+    device/asus/flocaf/audio_effects.conf:system/vendor/etc/audio_effects.conf
 
 # Monitor device rotation for speaker channel swap
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -192,7 +192,7 @@ PRODUCT_PACKAGES += \
 	power.msm8960
 
 PRODUCT_COPY_FILES += \
-	device/asus/flo/init.flo.bt.sh:system/bin/init.flo.bt.sh
+	device/asus/flocaf/init.flo.bt.sh:system/bin/init.flo.bt.sh
 
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.qualcomm.bt.hci_transport=smd
@@ -289,8 +289,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     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
+    device/asus/flocaf/nfc/libnfc-brcm.conf:system/etc/libnfc-brcm.conf \
+    device/asus/flocaf/nfc/libnfc-brcm-20791b05.conf:system/etc/libnfc-brcm-20791b05.conf
 
 # http://b/15193147
 # TODO(danalbert): Remove this once stlport is dead and gone.
diff --git a/device.mk b/device.mk
index 4924840..12c597b 100644
--- a/device.mk
+++ b/device.mk
@@ -24,8 +24,8 @@ 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
+    device/asus/flocaf/fstab.flo:root/fstab.flo \
+    device/asus/flocaf/init.flo.rc:root/init.flo.rc
 
 PRODUCT_PACKAGES += \
     camera.flo
@@ -35,9 +35,9 @@ PRODUCT_PACKAGES += \
     nfc_nci.bcm2079x.default
 
 # the actual meat of the device-specific product definition
-$(call inherit-product, device/asus/flo/device-common.mk)
+$(call inherit-product, device/asus/flocaf/device-common.mk)
 
 # inherit from the non-open-source side, if present
 $(call inherit-product-if-exists, vendor/asus/flo/device-vendor.mk)
 
-DEVICE_PACKAGE_OVERLAYS := device/asus/flo/overlay
+DEVICE_PACKAGE_OVERLAYS := device/asus/flocaf/overlay
diff --git a/full_flo.mk b/full_flo.mk
index f386494..389bdcf 100644
--- a/full_flo.mk
+++ b/full_flo.mk
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-$(call inherit-product, device/asus/flo/aosp_flo.mk)
+$(call inherit-product, device/asus/flocaf/aosp_flo.mk)
 
 PRODUCT_NAME := full_flo