From 91f7620c4d6d8dc1177e3d85964c3b1f71a0c722 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Thu, 6 Jul 2017 08:21:30 -0500 Subject: [PATCH] vendor: change vendor to lineage Change-Id: I2df13091f5d62b552ef434aef1a389f4fe1249e0 --- bootanimation/Android.mk | 2 +- bootanimation/generate-bootanimation.sh | 4 +- build/core/config.mk | 8 ++-- build/core/http_prebuilt.mk | 4 +- build/core/mtk_target.mk | 2 +- build/core/qcom_target.mk | 2 +- build/envsetup.sh | 4 +- build/tasks/addonsu.mk | 2 +- build/templates/extract-files.sh | 2 +- build/templates/setup-makefiles.sh | 2 +- build/tools/extract_utils.sh | 6 +-- ...BoardConfigCM.mk => BoardConfigLineage.mk} | 0 config/cm_audio.mk | 8 ++-- config/cmsdk_common.mk | 22 +++++----- config/common.mk | 40 +++++++++---------- config/common_full.mk | 2 +- config/common_full_phone.mk | 6 +-- config/common_full_tablet_wifionly.mk | 4 +- config/common_full_tv.mk | 2 +- config/common_mini.mk | 2 +- config/common_mini_phone.mk | 4 +- config/common_mini_tablet_wifionly.mk | 2 +- config/common_mini_tv.mk | 2 +- config/data_only.mk | 2 +- config/telephony.mk | 4 +- sepolicy/qcom/sepolicy.mk | 2 +- sepolicy/sepolicy.mk | 2 +- 27 files changed, 71 insertions(+), 71 deletions(-) rename config/{BoardConfigCM.mk => BoardConfigLineage.mk} (100%) diff --git a/bootanimation/Android.mk b/bootanimation/Android.mk index 77547e31..9526112c 100644 --- a/bootanimation/Android.mk +++ b/bootanimation/Android.mk @@ -16,7 +16,7 @@ # define build-bootanimation - sh vendor/cm/bootanimation/generate-bootanimation.sh \ + sh vendor/lineage/bootanimation/generate-bootanimation.sh \ $(TARGET_SCREEN_WIDTH) \ $(TARGET_SCREEN_HEIGHT) \ $(TARGET_BOOTANIMATION_HALF_RES) diff --git a/bootanimation/generate-bootanimation.sh b/bootanimation/generate-bootanimation.sh index cab7be8d..3bcb2725 100755 --- a/bootanimation/generate-bootanimation.sh +++ b/bootanimation/generate-bootanimation.sh @@ -26,12 +26,12 @@ for part_cnt in 0 1 2 3 4 do mkdir -p $ANDROID_PRODUCT_OUT/obj/BOOTANIMATION/bootanimation/part$part_cnt done -tar xfp "vendor/cm/bootanimation/bootanimation.tar" -C "$OUT/bootanimation/" +tar xfp "vendor/lineage/bootanimation/bootanimation.tar" -C "$OUT/bootanimation/" mogrify -resize $RESOLUTION -colors 250 "$OUT/bootanimation/"*"/"*".png" # Create desc.txt echo "$IMAGESCALEWIDTH $IMAGESCALEHEIGHT" 60 > "$OUT/bootanimation/desc.txt" -cat "vendor/cm/bootanimation/desc.txt" >> "$OUT/bootanimation/desc.txt" +cat "vendor/lineage/bootanimation/desc.txt" >> "$OUT/bootanimation/desc.txt" # Create bootanimation.zip cd "$OUT/bootanimation" diff --git a/build/core/config.mk b/build/core/config.mk index 026b458d..19e25214 100644 --- a/build/core/config.mk +++ b/build/core/config.mk @@ -18,9 +18,9 @@ INTERNAL_CM_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm INTERNAL_CM_PLATFORM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_removed.txt FRAMEWORK_CM_PLATFORM_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_current.txt FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_removed.txt -FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/cm/build/core/apicheck_msg_current.txt +FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/lineage/build/core/apicheck_msg_current.txt -BUILD_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact.mk -PUBLISH_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact_publish.mk +BUILD_MAVEN_PREBUILT := $(TOP)/vendor/lineage/build/core/maven_artifact.mk +PUBLISH_MAVEN_PREBUILT := $(TOP)/vendor/lineage/build/core/maven_artifact_publish.mk -BUILD_HTTP_PREBUILT := $(TOP)/vendor/cm/build/core/http_prebuilt.mk +BUILD_HTTP_PREBUILT := $(TOP)/vendor/lineage/build/core/http_prebuilt.mk diff --git a/build/core/http_prebuilt.mk b/build/core/http_prebuilt.mk index 4d7556a6..592df5c0 100644 --- a/build/core/http_prebuilt.mk +++ b/build/core/http_prebuilt.mk @@ -25,7 +25,7 @@ ifeq ($(strip $(LOCAL_HTTP_MD5SUM)),) $(error LOCAL_HTTP_MD5SUM not defined.) endif -PREBUILT_MODULE_ARCHIVE := vendor/cm/prebuilt/archive/$(LOCAL_MODULE) +PREBUILT_MODULE_ARCHIVE := vendor/lineage/prebuilt/archive/$(LOCAL_MODULE) PREBUILT_MODULE_FILE := $(PREBUILT_MODULE_ARCHIVE)/$(LOCAL_HTTP_FILENAME) @@ -64,7 +64,7 @@ endef # $(1) url # $(2) file output define download-prebuilt-module - ./vendor/cm/build/tasks/http_curl_prebuilt.sh $(1) $(2); + ./vendor/lineage/build/tasks/http_curl_prebuilt.sh $(1) $(2); endef define cleanup diff --git a/build/core/mtk_target.mk b/build/core/mtk_target.mk index 6dfeb6e0..11a7f8c7 100644 --- a/build/core/mtk_target.mk +++ b/build/core/mtk_target.mk @@ -1,5 +1,5 @@ # Bring in Mediatek helper macros -include vendor/cm/build/core/mtk_utils.mk +include vendor/lineage/build/core/mtk_utils.mk ifeq ($(BOARD_USES_MTK_HARDWARE),true) mtk_flags := -DMTK_HARDWARE diff --git a/build/core/qcom_target.mk b/build/core/qcom_target.mk index e36958a9..9bbe252f 100644 --- a/build/core/qcom_target.mk +++ b/build/core/qcom_target.mk @@ -1,7 +1,7 @@ # Target-specific configuration # Bring in Qualcomm helper macros -include vendor/cm/build/core/qcom_utils.mk +include vendor/lineage/build/core/qcom_utils.mk # Populate the qcom hardware variants in the project pathmap. define ril-set-path-variant diff --git a/build/envsetup.sh b/build/envsetup.sh index d13fa39a..2f7568da 100644 --- a/build/envsetup.sh +++ b/build/envsetup.sh @@ -43,7 +43,7 @@ function breakfast() CM_DEVICES_ONLY="true" unset LUNCH_MENU_CHOICES add_lunch_combo full-eng - for f in `/bin/ls vendor/cm/vendorsetup.sh 2> /dev/null` + for f in `/bin/ls vendor/lineage/vendorsetup.sh 2> /dev/null` do echo "including $f" . $f @@ -925,7 +925,7 @@ alias cmkap='dopush cmka' function repopick() { T=$(gettop) - $T/vendor/cm/build/tools/repopick.py $@ + $T/vendor/lineage/build/tools/repopick.py $@ } function fixup_common_out_dir() { diff --git a/build/tasks/addonsu.mk b/build/tasks/addonsu.mk index 6979586e..9b367c11 100644 --- a/build/tasks/addonsu.mk +++ b/build/tasks/addonsu.mk @@ -1,4 +1,4 @@ -ADDONSU_PREBUILTS_PATH := vendor/cm/addonsu/ +ADDONSU_PREBUILTS_PATH := vendor/lineage/addonsu/ ADDONSU_INSTALL_OUT := $(PRODUCT_OUT)/addonsu-install/ ADDONSU_INSTALL_TARGET := $(PRODUCT_OUT)/addonsu-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_ARCH).zip diff --git a/build/templates/extract-files.sh b/build/templates/extract-files.sh index 15130813..744715b0 100755 --- a/build/templates/extract-files.sh +++ b/build/templates/extract-files.sh @@ -27,7 +27,7 @@ if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi CM_ROOT="$MY_DIR"/../../.. -HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh +HELPER="$CM_ROOT"/vendor/lineage/build/tools/extract_utils.sh if [ ! -f "$HELPER" ]; then echo "Unable to find helper script at $HELPER" exit 1 diff --git a/build/templates/setup-makefiles.sh b/build/templates/setup-makefiles.sh index 43baafe3..a961eb99 100755 --- a/build/templates/setup-makefiles.sh +++ b/build/templates/setup-makefiles.sh @@ -29,7 +29,7 @@ if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi CM_ROOT="$MY_DIR"/../../.. -HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh +HELPER="$CM_ROOT"/vendor/lineage/build/tools/extract_utils.sh if [ ! -f "$HELPER" ]; then echo "Unable to find helper script at $HELPER" exit 1 diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh index b7350734..a34c31c5 100644 --- a/build/tools/extract_utils.sh +++ b/build/tools/extract_utils.sh @@ -685,8 +685,8 @@ function oat2dex() { local OAT= if [ -z "$BAKSMALIJAR" ] || [ -z "$SMALIJAR" ]; then - export BAKSMALIJAR="$CM_ROOT"/vendor/cm/build/tools/smali/baksmali.jar - export SMALIJAR="$CM_ROOT"/vendor/cm/build/tools/smali/smali.jar + export BAKSMALIJAR="$CM_ROOT"/vendor/lineage/build/tools/smali/baksmali.jar + export SMALIJAR="$CM_ROOT"/vendor/lineage/build/tools/smali/smali.jar fi # Extract existing boot.oats to the temp folder @@ -837,7 +837,7 @@ function extract() { # If OTA is block based, extract it. elif [ -a "$DUMPDIR"/system.new.dat ]; then echo "Converting system.new.dat to system.img" - python "$CM_ROOT"/vendor/cm/build/tools/sdat2img.py "$DUMPDIR"/system.transfer.list "$DUMPDIR"/system.new.dat "$DUMPDIR"/system.img 2>&1 + python "$CM_ROOT"/vendor/lineage/build/tools/sdat2img.py "$DUMPDIR"/system.transfer.list "$DUMPDIR"/system.new.dat "$DUMPDIR"/system.img 2>&1 rm -rf "$DUMPDIR"/system.new.dat "$DUMPDIR"/system mkdir "$DUMPDIR"/system "$DUMPDIR"/tmp echo "Requesting sudo access to mount the system.img" diff --git a/config/BoardConfigCM.mk b/config/BoardConfigLineage.mk similarity index 100% rename from config/BoardConfigCM.mk rename to config/BoardConfigLineage.mk diff --git a/config/cm_audio.mk b/config/cm_audio.mk index f5f659f2..0cee9df6 100644 --- a/config/cm_audio.mk +++ b/config/cm_audio.mk @@ -2,10 +2,10 @@ # CyanogenMod Audio Files # -ALARM_PATH := vendor/cm/prebuilt/common/media/audio/alarms -NOTIFICATION_PATH := vendor/cm/prebuilt/common/media/audio/notifications -RINGTONE_PATH := vendor/cm/prebuilt/common/media/audio/ringtones -UI_PATH := vendor/cm/prebuilt/common/media/audio/ui +ALARM_PATH := vendor/lineage/prebuilt/common/media/audio/alarms +NOTIFICATION_PATH := vendor/lineage/prebuilt/common/media/audio/notifications +RINGTONE_PATH := vendor/lineage/prebuilt/common/media/audio/ringtones +UI_PATH := vendor/lineage/prebuilt/common/media/audio/ui # Alarms PRODUCT_COPY_FILES += \ diff --git a/config/cmsdk_common.mk b/config/cmsdk_common.mk index 5c9a8369..a7316b4e 100644 --- a/config/cmsdk_common.mk +++ b/config/cmsdk_common.mk @@ -1,16 +1,16 @@ # Permissions for cmsdk services PRODUCT_COPY_FILES += \ - vendor/cm/config/permissions/org.cyanogenmod.appsuggest.xml:system/etc/permissions/org.cyanogenmod.appsuggest.xml \ - vendor/cm/config/permissions/org.cyanogenmod.audio.xml:system/etc/permissions/org.cyanogenmod.audio.xml \ - vendor/cm/config/permissions/org.cyanogenmod.livedisplay.xml:system/etc/permissions/org.cyanogenmod.livedisplay.xml \ - vendor/cm/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml \ - vendor/cm/config/permissions/org.cyanogenmod.partner.xml:system/etc/permissions/org.cyanogenmod.partner.xml \ - vendor/cm/config/permissions/org.cyanogenmod.performance.xml:system/etc/permissions/org.cyanogenmod.performance.xml \ - vendor/cm/config/permissions/org.cyanogenmod.profiles.xml:system/etc/permissions/org.cyanogenmod.profiles.xml \ - vendor/cm/config/permissions/org.cyanogenmod.statusbar.xml:system/etc/permissions/org.cyanogenmod.statusbar.xml \ - vendor/cm/config/permissions/org.cyanogenmod.telephony.xml:system/etc/permissions/org.cyanogenmod.telephony.xml \ - vendor/cm/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml \ - vendor/cm/config/permissions/org.cyanogenmod.weather.xml:system/etc/permissions/org.cyanogenmod.weather.xml + vendor/lineage/config/permissions/org.cyanogenmod.appsuggest.xml:system/etc/permissions/org.cyanogenmod.appsuggest.xml \ + vendor/lineage/config/permissions/org.cyanogenmod.audio.xml:system/etc/permissions/org.cyanogenmod.audio.xml \ + vendor/lineage/config/permissions/org.cyanogenmod.livedisplay.xml:system/etc/permissions/org.cyanogenmod.livedisplay.xml \ + vendor/lineage/config/permissions/org.cyanogenmod.livelockscreen.xml:system/etc/permissions/org.cyanogenmod.livelockscreen.xml \ + vendor/lineage/config/permissions/org.cyanogenmod.partner.xml:system/etc/permissions/org.cyanogenmod.partner.xml \ + vendor/lineage/config/permissions/org.cyanogenmod.performance.xml:system/etc/permissions/org.cyanogenmod.performance.xml \ + vendor/lineage/config/permissions/org.cyanogenmod.profiles.xml:system/etc/permissions/org.cyanogenmod.profiles.xml \ + vendor/lineage/config/permissions/org.cyanogenmod.statusbar.xml:system/etc/permissions/org.cyanogenmod.statusbar.xml \ + vendor/lineage/config/permissions/org.cyanogenmod.telephony.xml:system/etc/permissions/org.cyanogenmod.telephony.xml \ + vendor/lineage/config/permissions/org.cyanogenmod.theme.xml:system/etc/permissions/org.cyanogenmod.theme.xml \ + vendor/lineage/config/permissions/org.cyanogenmod.weather.xml:system/etc/permissions/org.cyanogenmod.weather.xml # CM Platform Library PRODUCT_PACKAGES += \ diff --git a/config/common.mk b/config/common.mk index 26235de7..bb53b1cf 100644 --- a/config/common.mk +++ b/config/common.mk @@ -33,41 +33,41 @@ endif # Copy over the changelog to the device PRODUCT_COPY_FILES += \ - vendor/cm/CHANGELOG.mkdn:system/etc/CHANGELOG-CM.txt + vendor/lineage/CHANGELOG.mkdn:system/etc/CHANGELOG-CM.txt # Backup Tool PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \ - vendor/cm/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \ - vendor/cm/prebuilt/common/bin/50-cm.sh:system/addon.d/50-cm.sh \ - vendor/cm/prebuilt/common/bin/blacklist:system/addon.d/blacklist + vendor/lineage/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \ + vendor/lineage/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \ + vendor/lineage/prebuilt/common/bin/50-cm.sh:system/addon.d/50-cm.sh \ + vendor/lineage/prebuilt/common/bin/blacklist:system/addon.d/blacklist # Backup Services whitelist PRODUCT_COPY_FILES += \ - vendor/cm/config/permissions/backup.xml:system/etc/sysconfig/backup.xml + vendor/lineage/config/permissions/backup.xml:system/etc/sysconfig/backup.xml # Signature compatibility validation PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/bin/otasigcheck.sh:install/bin/otasigcheck.sh + vendor/lineage/prebuilt/common/bin/otasigcheck.sh:install/bin/otasigcheck.sh # init.d support PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \ - vendor/cm/prebuilt/common/bin/sysinit:system/bin/sysinit + vendor/lineage/prebuilt/common/etc/init.d/00banner:system/etc/init.d/00banner \ + vendor/lineage/prebuilt/common/bin/sysinit:system/bin/sysinit ifneq ($(TARGET_BUILD_VARIANT),user) # userinit support PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit + vendor/lineage/prebuilt/common/etc/init.d/90userinit:system/etc/init.d/90userinit endif # CM-specific init file PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/etc/init.local.rc:root/init.cm.rc + vendor/lineage/prebuilt/common/etc/init.local.rc:root/init.cm.rc # Copy over added mimetype supported in libcore.net.MimeUtils PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/lib/content-types.properties:system/lib/content-types.properties + vendor/lineage/prebuilt/common/lib/content-types.properties:system/lib/content-types.properties # Enable SIP+VoIP on all targets PRODUCT_COPY_FILES += \ @@ -79,22 +79,22 @@ PRODUCT_COPY_FILES += \ # This is CM! PRODUCT_COPY_FILES += \ - vendor/cm/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml + vendor/lineage/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml # Include CM audio files -include vendor/cm/config/cm_audio.mk +include vendor/lineage/config/cm_audio.mk # Theme engine -include vendor/cm/config/themes_common.mk +include vendor/lineage/config/themes_common.mk ifneq ($(TARGET_DISABLE_CMSDK), true) # CMSDK -include vendor/cm/config/cmsdk_common.mk +include vendor/lineage/config/cmsdk_common.mk endif # TWRP ifeq ($(WITH_TWRP),true) -include vendor/cm/config/twrp.mk +include vendor/lineage/config/twrp.mk endif # Bootanimation @@ -235,7 +235,7 @@ PRODUCT_PACKAGES += \ endif endif -DEVICE_PACKAGE_OVERLAYS += vendor/cm/overlay/common +DEVICE_PACKAGE_OVERLAYS += vendor/lineage/overlay/common PRODUCT_VERSION_MAJOR = 14 PRODUCT_VERSION_MINOR = 1 @@ -324,7 +324,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.cmlegal.url=https://lineageos.org/legal PRODUCT_EXTRA_RECOVERY_KEYS += \ - vendor/cm/build/target/product/security/lineage + vendor/lineage/build/target/product/security/lineage -include vendor/cm-priv/keys/keys.mk @@ -357,7 +357,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.cm.display.version=$(CM_DISPLAY_VERSION) -include $(WORKSPACE)/build_env/image-auto-bits.mk --include vendor/cm/config/partner_gms.mk +-include vendor/lineage/config/partner_gms.mk -include vendor/cyngn/product.mk $(call prepend-product-if-exists, vendor/extra/product.mk) diff --git a/config/common_full.mk b/config/common_full.mk index c475a68e..b8813bc3 100644 --- a/config/common_full.mk +++ b/config/common_full.mk @@ -1,5 +1,5 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common.mk) +$(call inherit-product, vendor/lineage/config/common.mk) PRODUCT_SIZE := full diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk index 94798dc5..a482a435 100644 --- a/config/common_full_phone.mk +++ b/config/common_full_phone.mk @@ -1,11 +1,11 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common_full.mk) +$(call inherit-product, vendor/lineage/config/common_full.mk) # Required CM packages PRODUCT_PACKAGES += \ LatinIME # Include CM LatinIME dictionaries -PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries +PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries -$(call inherit-product, vendor/cm/config/telephony.mk) +$(call inherit-product, vendor/lineage/config/telephony.mk) diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk index 47e7845a..17b4a3b4 100644 --- a/config/common_full_tablet_wifionly.mk +++ b/config/common_full_tablet_wifionly.mk @@ -1,9 +1,9 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common_full.mk) +$(call inherit-product, vendor/lineage/config/common_full.mk) # Required CM packages PRODUCT_PACKAGES += \ LatinIME # Include CM LatinIME dictionaries -PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries +PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/dictionaries diff --git a/config/common_full_tv.mk b/config/common_full_tv.mk index 0a988e50..4fbb0159 100644 --- a/config/common_full_tv.mk +++ b/config/common_full_tv.mk @@ -1,4 +1,4 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common_full.mk) +$(call inherit-product, vendor/lineage/config/common_full.mk) PRODUCT_PACKAGES += TvSettings diff --git a/config/common_mini.mk b/config/common_mini.mk index ab1af912..926999e7 100644 --- a/config/common_mini.mk +++ b/config/common_mini.mk @@ -1,4 +1,4 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common.mk) +$(call inherit-product, vendor/lineage/config/common.mk) PRODUCT_SIZE := mini diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk index b4c0cb3d..b4e0274d 100644 --- a/config/common_mini_phone.mk +++ b/config/common_mini_phone.mk @@ -1,7 +1,7 @@ -$(call inherit-product, vendor/cm/config/common_mini.mk) +$(call inherit-product, vendor/lineage/config/common_mini.mk) # Required CM packages PRODUCT_PACKAGES += \ LatinIME -$(call inherit-product, vendor/cm/config/telephony.mk) +$(call inherit-product, vendor/lineage/config/telephony.mk) diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk index 285a55d4..797f81d4 100644 --- a/config/common_mini_tablet_wifionly.mk +++ b/config/common_mini_tablet_wifionly.mk @@ -1,5 +1,5 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common_mini.mk) +$(call inherit-product, vendor/lineage/config/common_mini.mk) # Required CM packages PRODUCT_PACKAGES += \ diff --git a/config/common_mini_tv.mk b/config/common_mini_tv.mk index 86f1a6b8..63832068 100644 --- a/config/common_mini_tv.mk +++ b/config/common_mini_tv.mk @@ -1,2 +1,2 @@ # Inherit common CM stuff -$(call inherit-product, vendor/cm/config/common_mini.mk) +$(call inherit-product, vendor/lineage/config/common_mini.mk) diff --git a/config/data_only.mk b/config/data_only.mk index 55f48c03..e46b33c3 100644 --- a/config/data_only.mk +++ b/config/data_only.mk @@ -1,6 +1,6 @@ # World APN list PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml + vendor/lineage/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml # Telephony packages PRODUCT_PACKAGES += \ diff --git a/config/telephony.mk b/config/telephony.mk index d6a5b01d..01b471f2 100644 --- a/config/telephony.mk +++ b/config/telephony.mk @@ -1,10 +1,10 @@ # Sensitive Phone Numbers list PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/etc/sensitive_pn.xml:system/etc/sensitive_pn.xml + vendor/lineage/prebuilt/common/etc/sensitive_pn.xml:system/etc/sensitive_pn.xml # World APN list PRODUCT_COPY_FILES += \ - vendor/cm/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml + vendor/lineage/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml # Telephony packages PRODUCT_PACKAGES += \ diff --git a/sepolicy/qcom/sepolicy.mk b/sepolicy/qcom/sepolicy.mk index 1214054a..d0e851fc 100644 --- a/sepolicy/qcom/sepolicy.mk +++ b/sepolicy/qcom/sepolicy.mk @@ -1,2 +1,2 @@ BOARD_SEPOLICY_DIRS += \ - vendor/cm/sepolicy/qcom + vendor/lineage/sepolicy/qcom diff --git a/sepolicy/sepolicy.mk b/sepolicy/sepolicy.mk index 14527874..a2ac9998 100644 --- a/sepolicy/sepolicy.mk +++ b/sepolicy/sepolicy.mk @@ -4,4 +4,4 @@ # BOARD_SEPOLICY_DIRS += \ - vendor/cm/sepolicy + vendor/lineage/sepolicy