From a148bca5f445445fb7a5e96b1cdd72ff6e382b56 Mon Sep 17 00:00:00 2001 From: Patrick Tjin Date: Fri, 29 Jan 2016 15:56:38 -0800 Subject: [PATCH] Rename directories to fix build Change-Id: Ia79052248f40df367aaaec8e9e29e692ed11f27b --- AndroidBoard.mk | 6 +-- aosp_marlin.mk | 4 +- aosp_sailfish.mk | 4 +- common/audio/htc-audio-effects.mk | 2 +- common/audio/htc-audio.mk | 20 ++++----- common/audio/qcom-msm8994-audio.mk | 2 +- common/base.mk | 14 +++--- common/common.mk | 4 +- common/common64.mk | 4 +- common/generate_extra_images.mk | 2 +- device-common.mk | 72 +++++++++++++++--------------- device-marlin.mk | 2 +- device-sailfish.mk | 2 +- marlin/BoardConfig.mk | 10 ++--- sailfish/BoardConfig.mk | 10 ++--- sepolicy/Android.mk | 8 ++-- 16 files changed, 83 insertions(+), 83 deletions(-) diff --git a/AndroidBoard.mk b/AndroidBoard.mk index 494163e1..fef2faa8 100644 --- a/AndroidBoard.mk +++ b/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 diff --git a/aosp_marlin.mk b/aosp_marlin.mk index acd78cba..5ffd3571 100644 --- a/aosp_marlin.mk +++ b/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 diff --git a/aosp_sailfish.mk b/aosp_sailfish.mk index 3a4835c4..1441e8f8 100644 --- a/aosp_sailfish.mk +++ b/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 diff --git a/common/audio/htc-audio-effects.mk b/common/audio/htc-audio-effects.mk index 0b3b07ff..3f25696c 100644 --- a/common/audio/htc-audio-effects.mk +++ b/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)) diff --git a/common/audio/htc-audio.mk b/common/audio/htc-audio.mk index fd64eb19..e8c99a92 100755 --- a/common/audio/htc-audio.mk +++ b/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 diff --git a/common/audio/qcom-msm8994-audio.mk b/common/audio/qcom-msm8994-audio.mk index c772f9c6..82c1c29c 100755 --- a/common/audio/qcom-msm8994-audio.mk +++ b/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 diff --git a/common/base.mk b/common/base.mk index c74af545..3de3499f 100644 --- a/common/base.mk +++ b/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 diff --git a/common/common.mk b/common/common.mk index b3431dc6..2ba5fb92 100644 --- a/common/common.mk +++ b/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) diff --git a/common/common64.mk b/common/common64.mk index a90d17cd..5fae5e0e 100644 --- a/common/common64.mk +++ b/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) diff --git a/common/generate_extra_images.mk b/common/generate_extra_images.mk index cbe9de26..2ef1d305 100644 --- a/common/generate_extra_images.mk +++ b/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) diff --git a/device-common.mk b/device-common.mk index 9abed31c..7e649ee3 100644 --- a/device-common.mk +++ b/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) diff --git a/device-marlin.mk b/device-marlin.mk index 1cd3bd23..65f67424 100644 --- a/device-marlin.mk +++ b/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 diff --git a/device-sailfish.mk b/device-sailfish.mk index 1cd3bd23..65f67424 100644 --- a/device-sailfish.mk +++ b/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 diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk index 336354f2..44ac016d 100644 --- a/marlin/BoardConfig.mk +++ b/marlin/BoardConfig.mk @@ -62,7 +62,7 @@ ENABLE_MULTI_INPUT := false ENABLE_ONEDOTONE_CHANNEL := false #All audio flags need to be definded before including htc-audio.mk -include device/htc/marlin/common/audio/htc-audio.mk +include device/google/marlin/common/audio/htc-audio.mk #HTC_AUD_END @@ -72,7 +72,7 @@ USE_CAMERA_STUB := true # Some framework code requires this to enable BT BOARD_HAVE_BLUETOOTH := true BOARD_USES_WIPOWER := true -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/htc/marlin/common +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/google/marlin/common USE_OPENGL_RENDERER := true BOARD_USE_LEGACY_UI := true @@ -98,7 +98,7 @@ endif BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=16M@0-0xffffffff -BOARD_EGL_CFG := device/htc/marlin/egl.cfg +BOARD_EGL_CFG := device/google/marlin/egl.cfg BOARD_KERNEL_SEPARATED_DT := true BOARD_KERNEL_BASE := 0x80000000 @@ -166,7 +166,7 @@ ADD_RADIO_FILES := true TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_msm TARGET_RECOVERY_UI_LIB := librecovery_ui_msm -TARGET_CRYPTFS_HW_PATH := device/htc/marlin/common/cryptfs_hw +TARGET_CRYPTFS_HW_PATH := device/google/marlin/common/cryptfs_hw #Add support for firmare upgrade on 8996 HAVE_SYNAPTICS_DSX_FW_UPGRADE := true @@ -174,4 +174,4 @@ HAVE_SYNAPTICS_DSX_FW_UPGRADE := true # Enable MDTP (Mobile Device Theft Protection) TARGET_USE_MDTP := true --include vendor/htc/marlin/BoardConfigVendor.mk +-include vendor/google_devices/marlin/BoardConfigVendor.mk diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk index 46c5a978..1943d2c2 100644 --- a/sailfish/BoardConfig.mk +++ b/sailfish/BoardConfig.mk @@ -62,7 +62,7 @@ ENABLE_MULTI_INPUT := false ENABLE_ONEDOTONE_CHANNEL := false #All audio flags need to be definded before including htc-audio.mk -include device/htc/marlin/common/audio/htc-audio.mk +include device/google/marlin/common/audio/htc-audio.mk #HTC_AUD_END @@ -72,7 +72,7 @@ USE_CAMERA_STUB := true # Some framework code requires this to enable BT BOARD_HAVE_BLUETOOTH := true BOARD_USES_WIPOWER := true -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/htc/marlin/common +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/google/marlin/common USE_OPENGL_RENDERER := true BOARD_USE_LEGACY_UI := true @@ -98,7 +98,7 @@ endif BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 cma=16M@0-0xffffffff -BOARD_EGL_CFG := device/htc/marlin/egl.cfg +BOARD_EGL_CFG := device/google/marlin/egl.cfg BOARD_KERNEL_SEPARATED_DT := true BOARD_KERNEL_BASE := 0x80000000 @@ -166,7 +166,7 @@ ADD_RADIO_FILES := true TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_msm TARGET_RECOVERY_UI_LIB := librecovery_ui_msm -TARGET_CRYPTFS_HW_PATH := device/htc/marlin/common/cryptfs_hw +TARGET_CRYPTFS_HW_PATH := device/google/marlin/common/cryptfs_hw #Add support for firmare upgrade on 8996 HAVE_SYNAPTICS_DSX_FW_UPGRADE := true @@ -174,4 +174,4 @@ HAVE_SYNAPTICS_DSX_FW_UPGRADE := true # Enable MDTP (Mobile Device Theft Protection) TARGET_USE_MDTP := true --include vendor/htc/marlin/BoardConfigVendor.mk +-include vendor/google_devices/marlin/BoardConfigVendor.mk diff --git a/sepolicy/Android.mk b/sepolicy/Android.mk index 496eac19..aa78000e 100644 --- a/sepolicy/Android.mk +++ b/sepolicy/Android.mk @@ -3,8 +3,8 @@ #ifeq ($(call is-vendor-board-platform,QCOM),true) #BOARD_SEPOLICY_DIRS := \ # $(BOARD_SEPOLICY_DIRS) \ -# device/htc/marlin/sepolicy \ -# device/htc/marlin/sepolicy/common \ -# device/htc/marlin/sepolicy/test \ -# device/htc/marlin/sepolicy/$(TARGET_BOARD_PLATFORM) +# device/google/marlin/sepolicy \ +# device/google/marlin/sepolicy/common \ +# device/google/marlin/sepolicy/test \ +# device/google/marlin/sepolicy/$(TARGET_BOARD_PLATFORM) #endif