From a9163d7c0e3308e10898067729519457ae2ad5eb Mon Sep 17 00:00:00 2001 From: Tet35 Date: Sat, 16 Feb 2019 12:04:57 +0200 Subject: [PATCH] Revert "Make ressurected" This reverts commit 4286283e107dcbfcf3a742b39f1108e67e31b2e9. --- README.md | 4 +- config.fs | 3 + extract-files.sh | 63 +++++++++++++++++++ lineage.dependencies | 6 ++ rr.mk => lineage.mk | 8 +-- .../base/core/res/res/values/rr_config.xml | 44 ------------- rr.dependencies | 6 -- setup-makefiles.sh | 48 ++++++++++++++ 8 files changed, 126 insertions(+), 56 deletions(-) create mode 100755 extract-files.sh create mode 100644 lineage.dependencies rename rr.mk => lineage.mk (88%) delete mode 100644 overlay/frameworks/base/core/res/res/values/rr_config.xml delete mode 100644 rr.dependencies create mode 100755 setup-makefiles.sh diff --git a/README.md b/README.md index 9fb8f73..dba147e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Resurrection Remix 6.0 (Android 8.1 Oreo) +Lineage OS 15.1 (Android 8.1 Oreo) device configuration for ZTE Nubia Z9 Max NX512J ===================================== @@ -19,4 +19,4 @@ Release Date | March 2015 ![ZTE Nubia Z9 Max](http://static.nubia.cn/product/max/images/params/params_z9max02.jpg "ZTE Nubia Z9 Max") -P.S. After "lunch", check the availability of repositories in your work directory, specified in rr.dependencies, and add them manually, if they are missing. +P.S. After "lunch", check the availability of repositories in your work directory, specified in lineage.dependencies, and add them manually, if they are missing. diff --git a/config.fs b/config.fs index f6297dc..c3570c4 100644 --- a/config.fs +++ b/config.fs @@ -1,3 +1,6 @@ +[AID_QCOM_DIAG] +value:2950 + [AID_RFS] value:2951 diff --git a/extract-files.sh b/extract-files.sh new file mode 100755 index 0000000..c99b823 --- /dev/null +++ b/extract-files.sh @@ -0,0 +1,63 @@ +#!/bin/bash +# +# Copyright (C) 2016 The CyanogenMod Project +# Copyright (C) 2017 The LineageOS Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +set -e + +DEVICE=nx511j +VENDOR=nubia + +# Load extract_utils and do some sanity checks +MY_DIR="${BASH_SOURCE%/*}" +if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi + +LINEAGE_ROOT="$MY_DIR"/../../.. + +HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh +if [ ! -f "$HELPER" ]; then + echo "Unable to find helper script at $HELPER" + exit 1 +fi +. "$HELPER" + +# Default to sanitizing the vendor folder before extraction +CLEAN_VENDOR=true + +while [ "$1" != "" ]; do + case $1 in + -n | --no-cleanup ) CLEAN_VENDOR=false + ;; + -s | --section ) shift + SECTION=$1 + CLEAN_VENDOR=false + ;; + * ) SRC=$1 + ;; + esac + shift +done + +if [ -z "$SRC" ]; then + SRC=adb +fi + +# Initialize the helper +setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" false "$CLEAN_VENDOR" + +extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION" + +"$MY_DIR"/setup-makefiles.sh diff --git a/lineage.dependencies b/lineage.dependencies new file mode 100644 index 0000000..1733158 --- /dev/null +++ b/lineage.dependencies @@ -0,0 +1,6 @@ +[ + { + "repository": "android_external_sony_boringssl-compat", + "target_path": "external/sony/boringssl-compat" + } +] diff --git a/rr.mk b/lineage.mk similarity index 88% rename from rr.mk rename to lineage.mk index 5343bdc..344efff 100644 --- a/rr.mk +++ b/lineage.mk @@ -15,12 +15,12 @@ $(call inherit-product, device/nubia/nx512j/full_nx512j.mk) -# Inherit some common stuff. -$(call inherit-product, vendor/rr/config/common_full_phone.mk) +# Inherit some common Lineage stuff. +$(call inherit-product, vendor/lineage/config/common_full_phone.mk) # Device identifiers -PRODUCT_NAME := rr_nx512j -PRODUCT_DEVICE := nx512j +PRODUCT_NAME := lineage_nx511j +PRODUCT_DEVICE := nx511j PRODUCT_MANUFACTURER := Nubia PRODUCT_BRAND := Nubia PRODUCT_MODEL := Nubia Z9 Max diff --git a/overlay/frameworks/base/core/res/res/values/rr_config.xml b/overlay/frameworks/base/core/res/res/values/rr_config.xml deleted file mode 100644 index a25c20d..0000000 --- a/overlay/frameworks/base/core/res/res/values/rr_config.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - 71 - true - 255 - - diff --git a/rr.dependencies b/rr.dependencies deleted file mode 100644 index 77b7291..0000000 --- a/rr.dependencies +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "repository": "LineageOS/android_external_sony_boringssl-compat", - "target_path": "external/sony/boringssl-compat" - } -] diff --git a/setup-makefiles.sh b/setup-makefiles.sh new file mode 100755 index 0000000..47302be --- /dev/null +++ b/setup-makefiles.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# +# Copyright (C) 2016 The CyanogenMod Project +# Copyright (C) 2017 The LineageOS Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +set -e + +DEVICE=nx511j +VENDOR=nubia + +INITIAL_COPYRIGHT_YEAR=2015 + +# Load extract_utils and do some sanity checks +MY_DIR="${BASH_SOURCE%/*}" +if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi + +LINEAGE_ROOT="$MY_DIR"/../../.. + +HELPER="$LINEAGE_ROOT"/vendor/lineage/build/tools/extract_utils.sh +if [ ! -f "$HELPER" ]; then + echo "Unable to find helper script at $HELPER" + exit 1 +fi +. "$HELPER" + +# Initialize the helper +setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" + +# Copyright headers and guards +write_headers + +write_makefiles "$MY_DIR"/proprietary-files.txt + +# Finish +write_footers