Rename directories to fix build

Change-Id: Ia79052248f40df367aaaec8e9e29e692ed11f27b

AndroidBoard.mk

@@ -172,7 +172,7 @@ endif
 # HTC prebuilt subsys images to $(OUT)
 # -> vendor include device/qcom/msm8996/prebuilt-subsys-images.mk
 # TODO: move this in the vendor makefile
--include vendor/htc/marlin/prebuilt-subsys-images.mk
+-include vendor/google_devices/marlin/prebuilt-subsys-images.mk
 
 #----------------------------------------------------------------------
 # ultrasound support
@@ -207,12 +207,12 @@ endif
 # extra images
 #----------------------------------------------------------------------
 #ifeq (, $(wildcard vendor/qcom/build/tasks/generate_extra_images.mk))
-#include device/htc/marlin/common/generate_extra_images.mk
+#include device/google/marlin/common/generate_extra_images.mk
 #endif
 
 #----------------------------------------------------------------------
 # pick up additional files for Tiny Android builds
 #----------------------------------------------------------------------
 #ifeq ($(BUILD_TINY_ANDROID), true)
-#include device/htc/marlin/common/rootdir/Android.mk
+#include device/google/marlin/common/rootdir/Android.mk
 #endif

aosp_marlin.mk

@@ -27,8 +27,8 @@ PRODUCT_MODEL := AOSP on msm8996
 PRODUCT_MANUFACTURER := HTC
 PRODUCT_RESTRICT_VENDOR_FILES := true
 
-$(call inherit-product, device/htc/marlin/device-marlin.mk)
-$(call inherit-product-if-exists, vendor/htc/marlin/device-vendor.mk)
+$(call inherit-product, device/google/marlin/device-marlin.mk)
+$(call inherit-product-if-exists, vendor/google_devices/marlin/device-vendor.mk)
 
 PRODUCT_PACKAGES += \
     Launcher3

aosp_sailfish.mk

@@ -27,8 +27,8 @@ PRODUCT_MODEL := AOSP on msm8996
 PRODUCT_MANUFACTURER := HTC
 PRODUCT_RESTRICT_VENDOR_FILES := true
 
-$(call inherit-product, device/htc/marlin/device-sailfish.mk)
-$(call inherit-product-if-exists, vendor/htc/marlin/device-vendor.mk)
+$(call inherit-product, device/google/marlin/device-sailfish.mk)
+$(call inherit-product-if-exists, vendor/google_devices/marlin/device-vendor.mk)
 
 PRODUCT_PACKAGES += \
     Launcher3

common/audio/htc-audio-effects.mk

@@ -1,4 +1,4 @@
-EFFECT_CONFIG := device/htc/marlin/common/audio/audio_effects.conf
+EFFECT_CONFIG := device/google/marlin/common/audio/audio_effects.conf
 
 $(shell cat /dev/null > $(EFFECT_CONFIG))
 

common/audio/htc-audio.mk

@@ -1,7 +1,7 @@
 # TODO: remove this, we should not be generating files in the source directory
 # Can remove htc_audio.h if nobody will include it.
 # Now keep to avoid somewhere meet build break.
-HEADER := device/htc/marlin/common/audio/htc_audio.h
+HEADER := device/google/marlin/common/audio/htc_audio.h
 HEADER_TEMP := $(HEADER).tmp
 
 $(shell cat /dev/null > $(HEADER_TEMP))
@@ -23,7 +23,7 @@ $(call append, \#define HTC_AUDIO_H)
 $(call append, \#endif //HTC_AUDIO_H)
 
 # include QCT platform features
--include device/htc/marlin/common/audio/qcom-$(TARGET_BOARD_PLATFORM)-audio.mk
+-include device/google/marlin/common/audio/qcom-$(TARGET_BOARD_PLATFORM)-audio.mk
 
 #
 # include below hTC features
@@ -230,14 +230,14 @@ ifeq ($(USES_NXP_DUAL_SPEAKER),true)
 HTC_INTERNAL_CDEFS += -DUSES_NXP_DUAL_SPEAKER
     ifeq ($(ENABLE_HARMAN_EFFECT),true)
          PRODUCT_COPY_FILES += \
-            device/htc/marlin/common/audio/HARMAN_default_vol_level.conf:system/etc/default_vol_level.conf
+            device/google/marlin/common/audio/HARMAN_default_vol_level.conf:system/etc/default_vol_level.conf
     else
          PRODUCT_COPY_FILES += \
-            device/htc/marlin/common/audio/DULTFA_default_vol_level.conf:system/etc/default_vol_level.conf
+            device/google/marlin/common/audio/DULTFA_default_vol_level.conf:system/etc/default_vol_level.conf
     endif
 else
      PRODUCT_COPY_FILES += \
-        device/htc/marlin/common/audio/NOTFA_default_vol_level.conf:system/etc/default_vol_level.conf
+        device/google/marlin/common/audio/NOTFA_default_vol_level.conf:system/etc/default_vol_level.conf
 endif
 
 ifeq ($(ENABLE_AUDIOVIDEO_TUNNEL),true)
@@ -260,12 +260,12 @@ endif
 
 ifeq ($(USES_TFA9887_LEFT),true)
      PRODUCT_COPY_FILES += \
-        device/htc/marlin/common/audio/DULTFA_default_vol_level.conf:system/etc/default_vol_level.conf
+        device/google/marlin/common/audio/DULTFA_default_vol_level.conf:system/etc/default_vol_level.conf
 else
      PRODUCT_COPY_FILES += \
-        device/htc/marlin/common/audio/TFA_default_vol_level.conf:system/etc/TFA_default_vol_level.conf
+        device/google/marlin/common/audio/TFA_default_vol_level.conf:system/etc/TFA_default_vol_level.conf
      PRODUCT_COPY_FILES += \
-        device/htc/marlin/common/audio/NOTFA_default_vol_level.conf:system/etc/NOTFA_default_vol_level.conf
+        device/google/marlin/common/audio/NOTFA_default_vol_level.conf:system/etc/NOTFA_default_vol_level.conf
 endif
 
 ifneq ($(CODEC_REG_PATH),)
@@ -322,7 +322,7 @@ PRODUCT_COPY_FILES += \
 $(warning ENABLE_GLOBAL_SRS_EFFECT: COPY SRS licence)
 endif
 
-PRODUCT_COPY_FILES += device/htc/marlin/common/audio/audio_effects.conf:system/etc/htc_audio_effects.conf
+PRODUCT_COPY_FILES += device/google/marlin/common/audio/audio_effects.conf:system/etc/htc_audio_effects.conf
 $(warning AUD: COPY common/audio/audio_effects.conf to system/etc/htc_audio_effects.conf)
 
-include device/htc/marlin/common/audio/htc-audio-effects.mk
+include device/google/marlin/common/audio/htc-audio-effects.mk

common/audio/qcom-msm8994-audio.mk

@@ -1,6 +1,6 @@
 ## QCT compile option
 # enable sequence: e.g., msm8994
-#    1. $ANDROID/device/htc/$TARGET_PRODUCT/BoardConfig.mk
+#    1. $ANDROID/device/google/$TARGET_PRODUCT/BoardConfig.mk
 #    2. $ANDROID/device/qcom/$TARGET_BOARD_PLATFORM/BoardConfig.mk
 #       -  include $(QCPATH)/common/$TARGET_BOARD_PLATFORM/BoardConfigVendor.mk
 #    3. $ANDROID/vendor/qcom/proprietary/common/$TARGET_BOARD_PLATFORM/BoardConfigVendor.mk

common/base.mk

@@ -150,7 +150,7 @@ BT := javax.btobex
 BT += libattrib_static
 BT += hcidump.sh
 BT += libbt-vendor
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/htc/marlin/common
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/google/marlin/common
 
 #C2DColorConvert
 C2DCC := libc2dcolorconvert
@@ -845,22 +845,22 @@ PRODUCT_COPY_FILES := \
 
 # gps/location secuity configuration file
 PRODUCT_COPY_FILES += \
-    device/htc/marlin/common/sec_config:system/etc/sec_config
+    device/google/marlin/common/sec_config:system/etc/sec_config
 
 PRODUCT_COPY_FILES += \
     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_telephony.xml:system/etc/media_codecs_google_telephony.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
-    device/htc/marlin/common/media/media_profiles.xml:system/etc/media_profiles.xml \
-    device/htc/marlin/common/media/media_codecs.xml:system/etc/media_codecs.xml
+    device/google/marlin/common/media/media_profiles.xml:system/etc/media_profiles.xml \
+    device/google/marlin/common/media/media_codecs.xml:system/etc/media_codecs.xml
 
 # enable overlays to use our version of
 # source/resources etc.
-DEVICE_PACKAGE_OVERLAYS += device/htc/marlin/common/device/overlay
-PRODUCT_PACKAGE_OVERLAYS += device/htc/marlin/common/product/overlay
+DEVICE_PACKAGE_OVERLAYS += device/google/marlin/common/device/overlay
+PRODUCT_PACKAGE_OVERLAYS += device/google/marlin/common/product/overlay
 
 # include additional build utilities
--include device/htc/marlin/common/utils.mk
+-include device/google/marlin/common/utils.mk
 
 #Enabling Ring Tones
 #include frameworks/base/data/sounds/OriginalAudio.mk

common/common.mk

@@ -1,4 +1,4 @@
-$(call inherit-product, device/htc/marlin/common/base.mk)
+$(call inherit-product, device/google/marlin/common/base.mk)
 
 # For PRODUCT_COPY_FILES, the first instance takes precedence.
 # Since we want use QC specific files, we should inherit
@@ -20,7 +20,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.radio.custom_ecc=1\
     persist.radio.sib16_support=1
 
-PRODUCT_PRIVATE_KEY := device/htc/marlin/common/qcom.key
+PRODUCT_PRIVATE_KEY := device/google/marlin/common/qcom.key
 PRODUCT_PACKAGES += qcril.db
 
 $(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)

common/common64.mk

@@ -1,4 +1,4 @@
-$(call inherit-product, device/htc/marlin/common/base.mk)
+$(call inherit-product, device/google/marlin/common/base.mk)
 
 # For PRODUCT_COPY_FILES, the first instance takes precedence.
 # Since we want use QC specific files, we should inherit
@@ -21,7 +21,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.radio.sib16_support=1 \
     persist.radio.custom_ecc=1
 
-PRODUCT_PRIVATE_KEY := device/htc/marlin/common/qcom.key
+PRODUCT_PRIVATE_KEY := device/google/marlin/common/qcom.key
 
 $(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
 #$(call inherit-product, frameworks/base/data/fonts/fonts.mk)

common/generate_extra_images.mk

@@ -89,7 +89,7 @@ endif
 ifneq ($(strip $(TARGET_NO_KERNEL)),true)
 ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)
 ifeq ($(strip $(BUILD_TINY_ANDROID)),true)
-include device/htc/marlin/common/dtbtool/Android.mk
+include device/google/marlin/common/dtbtool/Android.mk
 endif
 
 DTBTOOL := $(HOST_OUT_EXECUTABLES)/dtbTool$(HOST_EXECUTABLE_SUFFIX)

device-common.mk

@@ -22,7 +22,7 @@
 # TARGET_USES_CHINOOK_SENSORHUB := true
 
 ifeq ($(TARGET_PREBUILT_KERNEL),)
-    LOCAL_KERNEL := device/htc/marlin-kernel/Image.gz-dtb
+    LOCAL_KERNEL := device/google/marlin-kernel/Image.gz-dtb
 else
 LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
 endif
@@ -31,7 +31,7 @@ TARGET_KERNEL_DLKM_DISABLE := true
 PRODUCT_COPY_FILES += \
     $(LOCAL_KERNEL):kernel
 
-DEVICE_PACKAGE_OVERLAYS := device/htc/marlin/overlay
+DEVICE_PACKAGE_OVERLAYS := device/google/marlin/overlay
 TARGET_ENABLE_QC_AV_ENHANCEMENTS := true
 BOARD_HAVE_QCOM_FM := false
 TARGET_USES_NQ_NFC := false
@@ -41,18 +41,18 @@ TARGET_USES_NQ_NFC := false
 
 # copy customized media_profiles and media_codecs xmls for msm8996
 ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS), true)
-PRODUCT_COPY_FILES += device/htc/marlin/media_profiles.xml:system/etc/media_profiles.xml \
-                      device/htc/marlin/media_codecs.xml:system/etc/media_codecs.xml \
-                      device/htc/marlin/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
+PRODUCT_COPY_FILES += device/google/marlin/media_profiles.xml:system/etc/media_profiles.xml \
+                      device/google/marlin/media_codecs.xml:system/etc/media_codecs.xml \
+                      device/google/marlin/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
 endif  #TARGET_ENABLE_QC_AV_ENHANCEMENTS
 
-PRODUCT_COPY_FILES += device/htc/marlin/whitelistedapps.xml:system/etc/whitelistedapps.xml
+PRODUCT_COPY_FILES += device/google/marlin/whitelistedapps.xml:system/etc/whitelistedapps.xml
 
 # Override heap growth limit due to high display density on device
 PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.heapgrowthlimit=256m
 $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
-$(call inherit-product, device/htc/marlin/common/common64.mk)
+$(call inherit-product, device/google/marlin/common/common64.mk)
 
 #PRODUCT_NAME := msm8996
 #PRODUCT_DEVICE := msm8996
@@ -79,36 +79,36 @@ PRODUCT_PACKAGES += libGLES_android
 # Audio configuration file
 ifeq ($(TARGET_USES_AOSP), true)
 PRODUCT_COPY_FILES += \
-    device/htc/marlin/common/media/audio_policy.conf:system/etc/audio_policy.conf
+    device/google/marlin/common/media/audio_policy.conf:system/etc/audio_policy.conf
 else
 PRODUCT_COPY_FILES += \
-    device/htc/marlin/audio_policy.conf:system/etc/audio_policy.conf
+    device/google/marlin/audio_policy.conf:system/etc/audio_policy.conf
 endif
 
 PRODUCT_COPY_FILES += \
-    device/htc/marlin/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \
-    device/htc/marlin/audio_effects.conf:system/vendor/etc/audio_effects.conf \
-    device/htc/marlin/mixer_paths.xml:system/etc/mixer_paths.xml \
-    device/htc/marlin/mixer_paths_tasha.xml:system/etc/mixer_paths_tasha.xml \
-    device/htc/marlin/mixer_paths_dtp.xml:system/etc/mixer_paths_dtp.xml \
-    device/htc/marlin/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \
-    device/htc/marlin/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt \
-    device/htc/marlin/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \
-    device/htc/marlin/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \
-    device/htc/marlin/sound_trigger_mixer_paths_wcd9330.xml:system/etc/sound_trigger_mixer_paths_wcd9330.xml \
-    device/htc/marlin/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \
-    device/htc/marlin/audio_platform_info.xml:system/etc/audio_platform_info.xml \
-    device/htc/marlin/AudioBTIDnew.csv:system/etc/AudioBTIDnew.csv \
-    device/htc/marlin/Tfa98xx.cnt:system/etc/Tfa98xx.cnt \
-    device/htc/marlin/Tfa98xx2.cnt:system/etc/Tfa98xx2.cnt \
-    device/htc/marlin/Tfa98xx2_n1b.cnt:system/etc/Tfa98xx2_n1b.cnt \
-    device/htc/marlin/Tfa98xx_n1b.cnt:system/etc/Tfa98xx_n1b.cnt \
-    device/htc/marlin/htc_sound_mfg.txt:system/etc/htc_sound_mfg.txt
+    device/google/marlin/audio_output_policy.conf:system/vendor/etc/audio_output_policy.conf \
+    device/google/marlin/audio_effects.conf:system/vendor/etc/audio_effects.conf \
+    device/google/marlin/mixer_paths.xml:system/etc/mixer_paths.xml \
+    device/google/marlin/mixer_paths_tasha.xml:system/etc/mixer_paths_tasha.xml \
+    device/google/marlin/mixer_paths_dtp.xml:system/etc/mixer_paths_dtp.xml \
+    device/google/marlin/mixer_paths_i2s.xml:system/etc/mixer_paths_i2s.xml \
+    device/google/marlin/aanc_tuning_mixer.txt:system/etc/aanc_tuning_mixer.txt \
+    device/google/marlin/audio_platform_info_i2s.xml:system/etc/audio_platform_info_i2s.xml \
+    device/google/marlin/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \
+    device/google/marlin/sound_trigger_mixer_paths_wcd9330.xml:system/etc/sound_trigger_mixer_paths_wcd9330.xml \
+    device/google/marlin/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \
+    device/google/marlin/audio_platform_info.xml:system/etc/audio_platform_info.xml \
+    device/google/marlin/AudioBTIDnew.csv:system/etc/AudioBTIDnew.csv \
+    device/google/marlin/Tfa98xx.cnt:system/etc/Tfa98xx.cnt \
+    device/google/marlin/Tfa98xx2.cnt:system/etc/Tfa98xx2.cnt \
+    device/google/marlin/Tfa98xx2_n1b.cnt:system/etc/Tfa98xx2_n1b.cnt \
+    device/google/marlin/Tfa98xx_n1b.cnt:system/etc/Tfa98xx_n1b.cnt \
+    device/google/marlin/htc_sound_mfg.txt:system/etc/htc_sound_mfg.txt
 
 # WLAN driver configuration files
 PRODUCT_COPY_FILES += \
-    device/htc/marlin/WCNSS_cfg.dat:system/etc/firmware/wlan/qca_cld/WCNSS_cfg.dat \
-    device/htc/marlin/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini
+    device/google/marlin/WCNSS_cfg.dat:system/etc/firmware/wlan/qca_cld/WCNSS_cfg.dat \
+    device/google/marlin/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini
 
 # MIDI feature
 PRODUCT_COPY_FILES += \
@@ -120,7 +120,7 @@ PRODUCT_PACKAGES += \
 
 # Listen configuration file
 PRODUCT_COPY_FILES += \
-    device/htc/marlin/listen_platform_info.xml:system/etc/listen_platform_info.xml
+    device/google/marlin/listen_platform_info.xml:system/etc/listen_platform_info.xml
 
 #ANT+ stack
 PRODUCT_PACKAGES += \
@@ -131,7 +131,7 @@ PRODUCT_PACKAGES += \
 
 # Sensor HAL conf file
 PRODUCT_COPY_FILES += \
-    device/htc/marlin/sensors/hals.conf:system/etc/sensors/hals.conf
+    device/google/marlin/sensors/hals.conf:system/etc/sensors/hals.conf
 
 # Sensor features
 PRODUCT_COPY_FILES += \
@@ -149,9 +149,9 @@ PRODUCT_COPY_FILES += \
 
 # HTC_SENSOR_HUB
 PRODUCT_COPY_FILES += \
-    device/htc/marlin/i2ctest:system/bin/i2ctest \
-    device/htc/marlin/libftm_lib_i2c_utility.so:system/lib64/libftm_lib_i2c_utility.so \
-    device/htc/marlin/sensor_hub/sensor_hub_htc_xb.img:system/etc/firmware/sensor_hub_htc_xb.img
+    device/google/marlin/i2ctest:system/bin/i2ctest \
+    device/google/marlin/libftm_lib_i2c_utility.so:system/lib64/libftm_lib_i2c_utility.so \
+    device/google/marlin/sensor_hub/sensor_hub_htc_xb.img:system/etc/firmware/sensor_hub_htc_xb.img
 PRODUCT_PACKAGES += \
     downloadsensorhub
 
@@ -164,7 +164,7 @@ PRODUCT_COPY_FILES += \
 
 # MSM IRQ Balancer configuration file
 PRODUCT_COPY_FILES += \
-    device/htc/marlin/msm_irqbalance.conf:system/vendor/etc/msm_irqbalance.conf
+    device/google/marlin/msm_irqbalance.conf:system/vendor/etc/msm_irqbalance.conf
 
 ifeq ($(strip $(TARGET_USES_NQ_NFC)),true)
 PRODUCT_PACKAGES += \
@@ -216,7 +216,7 @@ PRODUCT_AAPT_CONFIG += xlarge large
 # TODO: move to vendor mk file
 ### HTC touch ###
 #PRODUCT_COPY_FILES += \
-#    vendor/htc/marlin/prebuilts/tp_SYN3708.img:system/etc/firmware/synaptics.img
+#    vendor/google_devices/marlin/prebuilts/tp_SYN3708.img:system/etc/firmware/synaptics.img
 
 $(call inherit-product-if-exists, hardware/qcom/msm8996/msm8996.mk)
 $(call inherit-product-if-exists, vendor/qcom/gpu/msm8996/msm8996-gpu-vendor.mk)

device-marlin.mk

@@ -18,4 +18,4 @@
 #
 # Everything in this directory will become public
 
--include device/htc/marlin/device-common.mk
+-include device/google/marlin/device-common.mk

device-sailfish.mk

@@ -18,4 +18,4 @@
 #
 # Everything in this directory will become public
 
--include device/htc/marlin/device-common.mk
+-include device/google/marlin/device-common.mk