From 5307dc6629b7be10d495de6affa79d749d4e11d9 Mon Sep 17 00:00:00 2001 From: LorDClockaN Date: Thu, 15 Aug 2019 15:10:15 +0200 Subject: marlin sailfish: AICPfy Change-Id: I2c77262d1c55db25d4fcc1d25beb8d77d8af6a48 --- AndroidProducts.mk | 4 +- BoardConfigAicp.mk | 11 ++++ BoardConfigLineage.mk | 11 ---- aicp.dependencies | 12 ++++ aicp_marlin.mk | 26 +++++++++ aicp_sailfish.mk | 26 +++++++++ device-aicp.mk | 41 ++++++++++++++ device-common.mk | 6 +- device-lineage.mk | 41 -------------- lineage.dependencies | 6 -- lineage_marlin.mk | 26 --------- lineage_sailfish.mk | 26 --------- marlin/BoardConfig.mk | 8 ++- marlin/BoardConfigAicp.mk | 4 ++ marlin/BoardConfigLineage.mk | 4 -- marlin/device-aicp.mk | 1 + marlin/device-lineage.mk | 1 - marlin/extract-files.sh | 10 ++-- marlin/setup-makefiles.sh | 8 +-- .../lineage-sdk/lineage/res/res/values/config.xml | 66 ---------------------- .../dialer/callrecord/res/values/config.xml | 35 ------------ .../packages/apps/Snap/res/values/strings.xml | 22 -------- sailfish/BoardConfig.mk | 8 ++- sailfish/BoardConfigAicp.mk | 4 ++ sailfish/BoardConfigLineage.mk | 4 -- sailfish/device-aicp.mk | 1 + sailfish/device-lineage.mk | 1 - sailfish/extract-files.sh | 10 ++-- sailfish/setup-makefiles.sh | 8 +-- telephony/Android.mk | 2 +- 30 files changed, 160 insertions(+), 273 deletions(-) create mode 100644 BoardConfigAicp.mk delete mode 100644 BoardConfigLineage.mk create mode 100644 aicp.dependencies create mode 100644 aicp_marlin.mk create mode 100644 aicp_sailfish.mk create mode 100644 device-aicp.mk delete mode 100644 device-lineage.mk delete mode 100644 lineage.dependencies delete mode 100644 lineage_marlin.mk delete mode 100644 lineage_sailfish.mk create mode 100644 marlin/BoardConfigAicp.mk delete mode 100644 marlin/BoardConfigLineage.mk create mode 100644 marlin/device-aicp.mk delete mode 100644 marlin/device-lineage.mk delete mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml delete mode 100644 overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml delete mode 100644 overlay-lineage/packages/apps/Snap/res/values/strings.xml create mode 100644 sailfish/BoardConfigAicp.mk delete mode 100644 sailfish/BoardConfigLineage.mk create mode 100644 sailfish/device-aicp.mk delete mode 100644 sailfish/device-lineage.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk index bd57cbe2..91f65937 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -2,5 +2,5 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_marlin.mk \ $(LOCAL_DIR)/aosp_marlin_svelte.mk \ $(LOCAL_DIR)/aosp_sailfish.mk \ - $(LOCAL_DIR)/lineage_marlin.mk \ - $(LOCAL_DIR)/lineage_sailfish.mk + $(LOCAL_DIR)/aicp_marlin.mk \ + $(LOCAL_DIR)/aicp_sailfish.mk diff --git a/BoardConfigAicp.mk b/BoardConfigAicp.mk new file mode 100644 index 00000000..40fbd104 --- /dev/null +++ b/BoardConfigAicp.mk @@ -0,0 +1,11 @@ +# Common board config for marlin, sailfish + +# Build vendor image +BOARD_VENDORIMAGE_PARTITION_SIZE := 314572800 +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 + +# Kernel +BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb +TARGET_COMPILE_WITH_MSM_KERNEL := true +TARGET_KERNEL_CONFIG := lineageos_marlin_defconfig +TARGET_KERNEL_SOURCE := kernel/google/marlin diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk deleted file mode 100644 index 40fbd104..00000000 --- a/BoardConfigLineage.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Common board config for marlin, sailfish - -# Build vendor image -BOARD_VENDORIMAGE_PARTITION_SIZE := 314572800 -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 - -# Kernel -BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb -TARGET_COMPILE_WITH_MSM_KERNEL := true -TARGET_KERNEL_CONFIG := lineageos_marlin_defconfig -TARGET_KERNEL_SOURCE := kernel/google/marlin diff --git a/aicp.dependencies b/aicp.dependencies new file mode 100644 index 00000000..6652c2c2 --- /dev/null +++ b/aicp.dependencies @@ -0,0 +1,12 @@ +[ + { + "repository": "AICP/kernel_google_marlin", + "target_path": "kernel/google/marlin", + "branch": "p9.0" + }, + { + "repository": "AICP/proprietary_vendor_google", + "target_path": "vendor/google", + "branch": "p9.0" + } +] diff --git a/aicp_marlin.mk b/aicp_marlin.mk new file mode 100644 index 00000000..b1bf8838 --- /dev/null +++ b/aicp_marlin.mk @@ -0,0 +1,26 @@ +# Boot animation +TARGET_SCREEN_HEIGHT := 2560 +TARGET_SCREEN_WIDTH := 1440 + +# Inherit some common Aicp stuff. +$(call inherit-product, vendor/aicp/config/common_full_phone.mk) + +# Inherit device configuration +$(call inherit-product, device/google/marlin/aosp_marlin.mk) + +-include device/google/marlin/marlin/device-aicp.mk + +## Device identifier. This must come after all inclusions +PRODUCT_NAME := aicp_marlin +PRODUCT_BRAND := google +PRODUCT_MODEL := Pixel XL +TARGET_MANUFACTURER := HTC +PRODUCT_RESTRICT_VENDOR_FILES := false + +PRODUCT_BUILD_PROP_OVERRIDES += \ + PRODUCT_NAME=marlin \ + PRIVATE_BUILD_DESC="marlin-user 9 PQ3A.190801.002 5670241 release-keys" + +BUILD_FINGERPRINT := google/marlin/marlin:9/PQ3A.190801.002/5670241:user/release-keys + +$(call inherit-product-if-exists, vendor/google/marlin/marlin-vendor.mk) diff --git a/aicp_sailfish.mk b/aicp_sailfish.mk new file mode 100644 index 00000000..3d6a5da5 --- /dev/null +++ b/aicp_sailfish.mk @@ -0,0 +1,26 @@ +# Boot animation +TARGET_SCREEN_HEIGHT := 1920 +TARGET_SCREEN_WIDTH := 1080 + +# Inherit some common Aicp stuff. +$(call inherit-product, vendor/aicp/config/common_full_phone.mk) + +# Inherit device configuration +$(call inherit-product, device/google/marlin/aosp_sailfish.mk) + +-include device/google/marlin/sailfish/device-aicp.mk + +## Device identifier. This must come after all inclusions +PRODUCT_NAME := aicp_sailfish +PRODUCT_BRAND := google +PRODUCT_MODEL := Pixel +TARGET_MANUFACTURER := HTC +PRODUCT_RESTRICT_VENDOR_FILES := false + +PRODUCT_BUILD_PROP_OVERRIDES += \ + PRODUCT_NAME=sailfish \ + PRIVATE_BUILD_DESC="sailfish-user 9 PQ3A.190801.002 5670241 release-keys" + +BUILD_FINGERPRINT := google/sailfish/sailfish:9/PQ3A.190801.002/5670241:user/release-keys + +$(call inherit-product-if-exists, vendor/google/sailfish/sailfish-vendor.mk) diff --git a/device-aicp.mk b/device-aicp.mk new file mode 100644 index 00000000..9a09136c --- /dev/null +++ b/device-aicp.mk @@ -0,0 +1,41 @@ +# Camera +PRODUCT_PACKAGES += \ + libmm-qcamera \ + Snap + +# DRM +PRODUCT_PACKAGES += \ + android.hardware.drm@1.1-service.clearkey + +PRODUCT_PROPERTY_OVERRIDES += \ + drm.service.enabled=true \ + media.mediadrmservice.enable=true + +# Google Assistant +PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.opa.eligible_device=true + +# IMS +PRODUCT_PACKAGES += \ + com.android.ims.rcsmanager \ + RcsService \ + PresencePolling + +# Overlays +DEVICE_PACKAGE_OVERLAYS += device/google/marlin/overlay-lineage + +# Sensors +PRODUCT_PACKAGES += \ + libsensorndkbridge + +# Tool +PRODUCT_PACKAGES += \ + libtinyxml + +# VR Services +PRODUCT_PACKAGES += \ + bufferhubd \ + com.google.vr.platform \ + com.google.vr.platform.xml \ + performanced \ + virtual_touchpad \ + vr_hwc diff --git a/device-common.mk b/device-common.mk index 4f04a651..4a39e088 100644 --- a/device-common.mk +++ b/device-common.mk @@ -288,7 +288,7 @@ PRODUCT_PACKAGES += \ # sensor utilities (only for userdebug and eng builds) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -ifeq (,$(filter lineage_marlin lineage_sailfish, $(TARGET_PRODUCT))) +ifeq (,$(filter aicp_marlin aicp_sailfish, $(TARGET_PRODUCT))) PRODUCT_PACKAGES += \ nanotool \ sensortest @@ -328,7 +328,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Write Manufacturer & Model information in created media files. # IMPORTANT: ONLY SET THIS PROPERTY TO TRUE FOR PUBLIC DEVICES -ifneq ($(filter lineage_sailfish% aosp_sailfish% sailfish% lineage_marlin% aosp_marlin% marlin%, $(TARGET_PRODUCT)),) +ifneq ($(filter aicp_sailfish% aosp_sailfish% sailfish% aicp_marlin% aosp_marlin% marlin%, $(TARGET_PRODUCT)),) PRODUCT_PROPERTY_OVERRIDES += \ media.recorder.show_manufacturer_and_model=true else @@ -530,7 +530,7 @@ PRODUCT_PACKAGES += \ # Library used for VTS tests (only for userdebug and eng builds) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -ifeq (,$(filter lineage_marlin lineage_sailfish, $(TARGET_PRODUCT))) +ifeq (,$(filter aicp_marlin aicp_sailfish, $(TARGET_PRODUCT))) # For VTS profiling. PRODUCT_PACKAGES += \ libvts_profiling \ diff --git a/device-lineage.mk b/device-lineage.mk deleted file mode 100644 index 9a09136c..00000000 --- a/device-lineage.mk +++ /dev/null @@ -1,41 +0,0 @@ -# Camera -PRODUCT_PACKAGES += \ - libmm-qcamera \ - Snap - -# DRM -PRODUCT_PACKAGES += \ - android.hardware.drm@1.1-service.clearkey - -PRODUCT_PROPERTY_OVERRIDES += \ - drm.service.enabled=true \ - media.mediadrmservice.enable=true - -# Google Assistant -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += ro.opa.eligible_device=true - -# IMS -PRODUCT_PACKAGES += \ - com.android.ims.rcsmanager \ - RcsService \ - PresencePolling - -# Overlays -DEVICE_PACKAGE_OVERLAYS += device/google/marlin/overlay-lineage - -# Sensors -PRODUCT_PACKAGES += \ - libsensorndkbridge - -# Tool -PRODUCT_PACKAGES += \ - libtinyxml - -# VR Services -PRODUCT_PACKAGES += \ - bufferhubd \ - com.google.vr.platform \ - com.google.vr.platform.xml \ - performanced \ - virtual_touchpad \ - vr_hwc diff --git a/lineage.dependencies b/lineage.dependencies deleted file mode 100644 index 4c6fc10e..00000000 --- a/lineage.dependencies +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "repository": "android_kernel_google_marlin", - "target_path": "kernel/google/marlin" - } -] diff --git a/lineage_marlin.mk b/lineage_marlin.mk deleted file mode 100644 index 7a1084c8..00000000 --- a/lineage_marlin.mk +++ /dev/null @@ -1,26 +0,0 @@ -# Boot animation -TARGET_SCREEN_HEIGHT := 2560 -TARGET_SCREEN_WIDTH := 1440 - -# Inherit some common Lineage stuff. -$(call inherit-product, vendor/lineage/config/common_full_phone.mk) - -# Inherit device configuration -$(call inherit-product, device/google/marlin/aosp_marlin.mk) - --include device/google/marlin/marlin/device-lineage.mk - -## Device identifier. This must come after all inclusions -PRODUCT_NAME := lineage_marlin -PRODUCT_BRAND := google -PRODUCT_MODEL := Pixel XL -TARGET_MANUFACTURER := HTC -PRODUCT_RESTRICT_VENDOR_FILES := false - -PRODUCT_BUILD_PROP_OVERRIDES += \ - PRODUCT_NAME=marlin \ - PRIVATE_BUILD_DESC="marlin-user 9 PQ3A.190801.002 5670241 release-keys" - -BUILD_FINGERPRINT := google/marlin/marlin:9/PQ3A.190801.002/5670241:user/release-keys - -$(call inherit-product-if-exists, vendor/google/marlin/marlin-vendor.mk) diff --git a/lineage_sailfish.mk b/lineage_sailfish.mk deleted file mode 100644 index 6e8ee8f7..00000000 --- a/lineage_sailfish.mk +++ /dev/null @@ -1,26 +0,0 @@ -# Boot animation -TARGET_SCREEN_HEIGHT := 1920 -TARGET_SCREEN_WIDTH := 1080 - -# Inherit some common Lineage stuff. -$(call inherit-product, vendor/lineage/config/common_full_phone.mk) - -# Inherit device configuration -$(call inherit-product, device/google/marlin/aosp_sailfish.mk) - --include device/google/marlin/sailfish/device-lineage.mk - -## Device identifier. This must come after all inclusions -PRODUCT_NAME := lineage_sailfish -PRODUCT_BRAND := google -PRODUCT_MODEL := Pixel -TARGET_MANUFACTURER := HTC -PRODUCT_RESTRICT_VENDOR_FILES := false - -PRODUCT_BUILD_PROP_OVERRIDES += \ - PRODUCT_NAME=sailfish \ - PRIVATE_BUILD_DESC="sailfish-user 9 PQ3A.190801.002 5670241 release-keys" - -BUILD_FINGERPRINT := google/sailfish/sailfish:9/PQ3A.190801.002/5670241:user/release-keys - -$(call inherit-product-if-exists, vendor/google/sailfish/sailfish-vendor.mk) diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk index 4f015fdf..6ac834a5 100644 --- a/marlin/BoardConfig.mk +++ b/marlin/BoardConfig.mk @@ -3,8 +3,8 @@ # Product-specific compile-time definitions # -# Allow Lineage config to override others --include device/google/marlin/marlin/BoardConfigLineage.mk +# Allow Aicp config to override others +-include device/google/marlin/marlin/BoardConfigAicp.mk TARGET_BOARD_PLATFORM := msm8996 TARGET_BOOTLOADER_BOARD_NAME := marlin @@ -12,6 +12,8 @@ TARGET_BOARD_INFO_FILE := device/google/marlin/marlin/board-info.txt TARGET_USES_INTERACTION_BOOST := true +SELINUX_IGNORE_NEVERALLOWS := true + TARGET_USES_AOSP := true TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a @@ -109,7 +111,7 @@ BOARD_ROOT_EXTRA_FOLDERS := firmware firmware/radio persist BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy -ifneq ($(filter lineage_marlin marlin marlinf, $(TARGET_PRODUCT)),) +ifneq ($(filter aicp_marlin marlin marlinf, $(TARGET_PRODUCT)),) BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon endif BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/marlin/sepolicy/private diff --git a/marlin/BoardConfigAicp.mk b/marlin/BoardConfigAicp.mk new file mode 100644 index 00000000..03a1cda8 --- /dev/null +++ b/marlin/BoardConfigAicp.mk @@ -0,0 +1,4 @@ +# BoardConfig for aicp_marlin +include device/google/marlin/BoardConfigAicp.mk + +-include vendor/google/marlin/BoardConfigVendor.mk diff --git a/marlin/BoardConfigLineage.mk b/marlin/BoardConfigLineage.mk deleted file mode 100644 index 43757e8d..00000000 --- a/marlin/BoardConfigLineage.mk +++ /dev/null @@ -1,4 +0,0 @@ -# BoardConfig for lineage_marlin -include device/google/marlin/BoardConfigLineage.mk - --include vendor/google/marlin/BoardConfigVendor.mk diff --git a/marlin/device-aicp.mk b/marlin/device-aicp.mk new file mode 100644 index 00000000..d1fce23b --- /dev/null +++ b/marlin/device-aicp.mk @@ -0,0 +1 @@ +$(call inherit-product, device/google/marlin/device-aicp.mk) diff --git a/marlin/device-lineage.mk b/marlin/device-lineage.mk deleted file mode 100644 index 137942dc..00000000 --- a/marlin/device-lineage.mk +++ /dev/null @@ -1 +0,0 @@ -$(call inherit-product, device/google/marlin/device-lineage.mk) diff --git a/marlin/extract-files.sh b/marlin/extract-files.sh index d3f3ea93..533b4e23 100755 --- a/marlin/extract-files.sh +++ b/marlin/extract-files.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2019 The Aicp Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ DEVICE=marlin MY_DIR="${BASH_SOURCE%/*}" if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi -LINEAGE_ROOT="$MY_DIR"/../../.. +AICP_ROOT="$MY_DIR"/../../.. -HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh +HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh if [ ! -f "$HELPER" ]; then echo "Unable to find helper script at $HELPER" exit 1 @@ -49,13 +49,13 @@ else fi # Initialize the helper -setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" +setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT" extract "$MY_DIR/$DEVICE"/device-proprietary-files.txt "$SRC" extract "$MY_DIR/$DEVICE"/device-proprietary-files-vendor.txt "$SRC" # Don't disable MyVerizonServices app sed -i 's|||g'\ - "$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/etc/sysconfig/nexus.xml + "$AICP_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/etc/sysconfig/nexus.xml "$MY_DIR/$DEVICE"/setup-makefiles.sh diff --git a/marlin/setup-makefiles.sh b/marlin/setup-makefiles.sh index 1a3385f6..f0217465 100755 --- a/marlin/setup-makefiles.sh +++ b/marlin/setup-makefiles.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2019 The AICP Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,9 +25,9 @@ INITIAL_COPYRIGHT_YEAR=2017 MY_DIR="${BASH_SOURCE%/*}" if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi -LINEAGE_ROOT="$MY_DIR"/../../../.. +AICP_ROOT="$MY_DIR"/../../../.. -HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh +HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh if [ ! -f "$HELPER" ]; then echo "Unable to find helper script at $HELPER" exit 1 @@ -35,7 +35,7 @@ fi . "$HELPER" # Initialize the helper -setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" +setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT" # Copyright headers and guards write_headers diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml deleted file mode 100644 index 22c8a36a..00000000 --- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - 75 - - diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml deleted file mode 100644 index de79aeec..00000000 --- a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - true - 4 - diff --git a/overlay-lineage/packages/apps/Snap/res/values/strings.xml b/overlay-lineage/packages/apps/Snap/res/values/strings.xml deleted file mode 100644 index 001cf1d5..00000000 --- a/overlay-lineage/packages/apps/Snap/res/values/strings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - 3840x2160 - - diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk index 466c02d3..0b7b2369 100644 --- a/sailfish/BoardConfig.mk +++ b/sailfish/BoardConfig.mk @@ -3,8 +3,8 @@ # Product-specific compile-time definitions # -# Allow Lineage config to override others --include device/google/marlin/sailfish/BoardConfigLineage.mk +# Allow Aicp config to override others +-include device/google/marlin/sailfish/BoardConfigAicp.mk TARGET_BOARD_PLATFORM := msm8996 TARGET_BOOTLOADER_BOARD_NAME := sailfish @@ -12,6 +12,8 @@ TARGET_BOARD_INFO_FILE := device/google/marlin/sailfish/board-info.txt TARGET_USES_INTERACTION_BOOST := true +SELINUX_IGNORE_NEVERALLOWS := true + TARGET_USES_AOSP := true TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a @@ -99,7 +101,7 @@ BOARD_ROOT_EXTRA_FOLDERS := firmware firmware/radio persist BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy -ifneq ($(filter lineage_sailfish sailfish sailfishf, $(TARGET_PRODUCT)),) +ifneq ($(filter aicp_sailfish sailfish sailfishf, $(TARGET_PRODUCT)),) BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon endif BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/marlin/sepolicy/private diff --git a/sailfish/BoardConfigAicp.mk b/sailfish/BoardConfigAicp.mk new file mode 100644 index 00000000..124fc7a0 --- /dev/null +++ b/sailfish/BoardConfigAicp.mk @@ -0,0 +1,4 @@ +# BoardConfig for lineage_sailfish +include device/google/marlin/BoardConfigLineage.mk + +-include vendor/google/sailfish/BoardConfigVendor.mk diff --git a/sailfish/BoardConfigLineage.mk b/sailfish/BoardConfigLineage.mk deleted file mode 100644 index 124fc7a0..00000000 --- a/sailfish/BoardConfigLineage.mk +++ /dev/null @@ -1,4 +0,0 @@ -# BoardConfig for lineage_sailfish -include device/google/marlin/BoardConfigLineage.mk - --include vendor/google/sailfish/BoardConfigVendor.mk diff --git a/sailfish/device-aicp.mk b/sailfish/device-aicp.mk new file mode 100644 index 00000000..d1fce23b --- /dev/null +++ b/sailfish/device-aicp.mk @@ -0,0 +1 @@ +$(call inherit-product, device/google/marlin/device-aicp.mk) diff --git a/sailfish/device-lineage.mk b/sailfish/device-lineage.mk deleted file mode 100644 index 137942dc..00000000 --- a/sailfish/device-lineage.mk +++ /dev/null @@ -1 +0,0 @@ -$(call inherit-product, device/google/marlin/device-lineage.mk) diff --git a/sailfish/extract-files.sh b/sailfish/extract-files.sh index 91bb11bc..4649d5e7 100755 --- a/sailfish/extract-files.sh +++ b/sailfish/extract-files.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2019 The LineageOS Project +# Copyright (C) 2019 The AICP Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ DEVICE=sailfish MY_DIR="${BASH_SOURCE%/*}" if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi -LINEAGE_ROOT="$MY_DIR"/../../.. +AICP_ROOT="$MY_DIR"/../../.. -HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh +HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh if [ ! -f "$HELPER" ]; then echo "Unable to find helper script at $HELPER" exit 1 @@ -49,13 +49,13 @@ else fi # Initialize the helper -setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" +setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT" extract "$MY_DIR"/../marlin/$DEVICE/device-proprietary-files.txt "$SRC" extract "$MY_DIR"/../marlin/$DEVICE/device-proprietary-files-vendor.txt "$SRC" # Don't disable MyVerizonServices app sed -i 's|||g'\ - "$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/etc/sysconfig/nexus.xml + "$AICP_ROOT"/vendor/"$VENDOR"/"$DEVICE"/proprietary/etc/sysconfig/nexus.xml "$MY_DIR/../marlin/$DEVICE"/setup-makefiles.sh diff --git a/sailfish/setup-makefiles.sh b/sailfish/setup-makefiles.sh index 0d3d70a5..17db89ec 100755 --- a/sailfish/setup-makefiles.sh +++ b/sailfish/setup-makefiles.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2019 The LineageOS Project +# Copyright (C) 2019 The AICP Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,9 +25,9 @@ INITIAL_COPYRIGHT_YEAR=2019 MY_DIR="${BASH_SOURCE%/*}" if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi -LINEAGE_ROOT="$MY_DIR"/../../../.. +AICP_ROOT="$MY_DIR"/../../../.. -HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh +HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh if [ ! -f "$HELPER" ]; then echo "Unable to find helper script at $HELPER" exit 1 @@ -35,7 +35,7 @@ fi . "$HELPER" # Initialize the helper -setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" +setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT" # Copyright headers and guards write_headers diff --git a/telephony/Android.mk b/telephony/Android.mk index 50da2484..21c055c4 100644 --- a/telephony/Android.mk +++ b/telephony/Android.mk @@ -1,3 +1,3 @@ -ifeq ($(LINEAGE_BUILD),) +ifeq ($(AICP_BUILD),) include $(call all-subdir-makefiles) endif -- cgit v1.2.3