From 2ab78ba47d3ee8d31b50958427e82c32de1f47b7 Mon Sep 17 00:00:00 2001 From: rcstar6696 Date: Tue, 25 Dec 2018 18:26:17 +0100 Subject: [PATCH] clover: rebrand to xiaomi-sdm660 project --- Android.bp | 9 ++- Android.mk | 2 +- AndroidProducts.mk | 4 +- BoardConfig.mk | 4 +- README.md | 2 +- device.mk | 60 +++++++++---------- havoc_clover.mk | 4 +- init/Android.mk | 9 ++- init/init_clover.cpp | 47 +++++++-------- light/Light.cpp | 9 ++- light/Light.h | 9 ++- light/service.cpp | 9 ++- .../base/core/res/res/values/config.xml | 2 +- 13 files changed, 101 insertions(+), 69 deletions(-) diff --git a/Android.bp b/Android.bp index 8837800..ec546b2 100644 --- a/Android.bp +++ b/Android.bp @@ -1,5 +1,5 @@ //# -//# Copyright (C) 2018 CarbonRom +//# Copyright (C) 2018 The Xiaomi-SDM660 Project //# //# Licensed under the Apache License, Version 2.0 (the "License"); //# you may not use this file except in compliance with the License. @@ -12,6 +12,13 @@ //# 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. + +//# +//# This file sets variables that control the way modules are built +//# thorughout the system. It should not be used to conditionally +//# disable makefiles (the proper mechanism to control what gets +//# included in a build is to use PRODUCT_PACKAGES in a product +//# definition file). //# subdirs = [ diff --git a/Android.mk b/Android.mk index e90a538..5905fcb 100644 --- a/Android.mk +++ b/Android.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 CarbonROM +# Copyright (C) 2018 The Xiaomi-SDM660 Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/AndroidProducts.mk b/AndroidProducts.mk index dbf7496..98fb3cf 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 CarbonROM +# Copyright (C) 2018 The Xiaomi-SDM660 Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,6 +21,6 @@ # definition file). # -# inherit MI PAD 4 CarbonRom device config +# inherit MI PAD 4 HAVOC-OS device config PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/havoc_clover.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index aa50404..5a72353 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 CarbonROM +# Copyright (C) 2018 The Xiaomi-SDM660 Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ TARGET_TAP_TO_WAKE_NODE := "/sys/devices/soc/c177000.i2c/i2c-3/3-0038/fts_gestur TARGET_INIT_VENDOR_LIB := libinit_clover TARGET_RECOVERY_DEVICE_MODULES := libinit_clover -# Manifest +# Manifest DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml # Security patch level diff --git a/README.md b/README.md index 08ddd84..8c8da4a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Copyright (C) 2018 CarbonROM +Copyright (C) 2018 Xiaomi-SDM660 Project The MI PAD 4 (codenamed _"clover"_) are high-end mid-range tablet from Xiaomi. diff --git a/device.mk b/device.mk index 0ccc79b..1052fe3 100644 --- a/device.mk +++ b/device.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 CarbonROM +# Copyright (C) 2018 The Xiaomi-SDM660 Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -29,32 +29,32 @@ DEVICE_PATH := device/xiaomi/clover # Overlays DEVICE_PACKAGE_OVERLAYS += \ - $(DEVICE_PATH)/overlay - + $(DEVICE_PATH)/overlay + # Device properties $(call inherit-product, $(DEVICE_PATH)/device_prop.mk) # These are the hardware-specific features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/tablet_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/tablet_core_hardware.xml - + # Permissions PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.camera.autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml + frameworks/native/data/etc/android.hardware.camera.autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml # Audio PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ - $(DEVICE_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ - $(DEVICE_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ - $(DEVICE_PATH)/audio/audio_platform_info_extcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_extcodec.xml \ - $(DEVICE_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(DEVICE_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ - $(DEVICE_PATH)/audio/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \ - $(DEVICE_PATH)/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml \ - $(DEVICE_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ - $(DEVICE_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ - $(DEVICE_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml + $(DEVICE_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ + $(DEVICE_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ + $(DEVICE_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ + $(DEVICE_PATH)/audio/audio_platform_info_extcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_extcodec.xml \ + $(DEVICE_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + $(DEVICE_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ + $(DEVICE_PATH)/audio/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \ + $(DEVICE_PATH)/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml \ + $(DEVICE_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ + $(DEVICE_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ + $(DEVICE_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml # Init PRODUCT_PACKAGES += \ @@ -62,29 +62,29 @@ PRODUCT_PACKAGES += \ # Sensors PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/sensors/sensor_def_qcomdev.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sensor_def_qcomdev.conf - + $(DEVICE_PATH)/sensors/sensor_def_qcomdev.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/sensor_def_qcomdev.conf + # Keylayouts PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/keylayout/uinput-fpc.kl:system/usr/keylayout/uinput-fpc.kl - + $(DEVICE_PATH)/keylayout/uinput-fpc.kl:system/usr/keylayout/uinput-fpc.kl + # Lights PRODUCT_PACKAGES += \ - android.hardware.light@2.0-service.xiaomi_clover - + android.hardware.light@2.0-service.xiaomi_clover + # Media PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ - $(DEVICE_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ - $(DEVICE_PATH)/media/media_profiles.xml:system/etc/media_profiles.xml \ - $(DEVICE_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ - $(DEVICE_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ - $(DEVICE_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml + $(DEVICE_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ + $(DEVICE_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ + $(DEVICE_PATH)/media/media_profiles.xml:system/etc/media_profiles.xml \ + $(DEVICE_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \ + $(DEVICE_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \ + $(DEVICE_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml # Ramdisk PRODUCT_PACKAGES += \ - init.device.rc \ - init.macaddress_setup.sh + init.device.rc \ + init.macaddress_setup.sh # Screen density PRODUCT_AAPT_CONFIG := large diff --git a/havoc_clover.mk b/havoc_clover.mk index 1ea48e9..bec6445 100644 --- a/havoc_clover.mk +++ b/havoc_clover.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 CarbonROM +# Copyright (C) 2018 The Xiaomi-SDM660 Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ PRODUCT_BUILD_PROP_OVERRIDES += \ PRIVATE_BUILD_DESC="clover-user 8.1.0 OPM1.171019.019 V10.1.1.0.ODJCNFI release-keys" BUILD_FINGERPRINT="Xiaomi/clover/clover:8.1.0/OPM1.171019.019/V10.1.1.0.ODJCNFI:user/release-keys" - + # Device identifier PRODUCT_BRAND := Xiaomi PRODUCT_MANUFACTURER := Xiaomi diff --git a/init/Android.mk b/init/Android.mk index 64014e0..16d7939 100755 --- a/init/Android.mk +++ b/init/Android.mk @@ -1,5 +1,5 @@ # -# Copyright 2018 The Android Open Source Project +# Copyright (C) 2018 The Xiaomi-SDM660 Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,6 +12,13 @@ # 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. + +# +# This file sets variables that control the way modules are built +# thorughout the system. It should not be used to conditionally +# disable makefiles (the proper mechanism to control what gets +# included in a build is to use PRODUCT_PACKAGES in a product +# definition file). # LOCAL_PATH:= $(call my-dir) diff --git a/init/init_clover.cpp b/init/init_clover.cpp index b5e2f66..90044e2 100755 --- a/init/init_clover.cpp +++ b/init/init_clover.cpp @@ -1,29 +1,26 @@ /* - Copyright (c) 2015, The Linux Foundation. All rights reserved. - Copyright (C) 2016 The CyanogenMod Project. - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of The Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Copyright (C) 2018 The Xiaomi-SDM660 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. + +# +# This file sets variables that control the way modules are built +# thorughout the system. It should not be used to conditionally +# disable makefiles (the proper mechanism to control what gets +# included in a build is to use PRODUCT_PACKAGES in a product +# definition file). +# */ #include diff --git a/light/Light.cpp b/light/Light.cpp index 2b83841..fbb8f20 100644 --- a/light/Light.cpp +++ b/light/Light.cpp @@ -1,6 +1,6 @@ /* # -# Copyright 2018 The Android Open Source Project +# Copyright (C) 2018 The Xiaomi-SDM660 Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,6 +13,13 @@ # 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. + +# +# This file sets variables that control the way modules are built +# thorughout the system. It should not be used to conditionally +# disable makefiles (the proper mechanism to control what gets +# included in a build is to use PRODUCT_PACKAGES in a product +# definition file). # */ diff --git a/light/Light.h b/light/Light.h index eb9ff0a..5d435ed 100644 --- a/light/Light.h +++ b/light/Light.h @@ -1,6 +1,6 @@ /* # -# Copyright 2018 The Android Open Source Project +# Copyright (C) 2018 The Xiaomi-SDM660 Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,6 +13,13 @@ # 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. + +# +# This file sets variables that control the way modules are built +# thorughout the system. It should not be used to conditionally +# disable makefiles (the proper mechanism to control what gets +# included in a build is to use PRODUCT_PACKAGES in a product +# definition file). # */ diff --git a/light/service.cpp b/light/service.cpp index 3d78647..44dd2cb 100644 --- a/light/service.cpp +++ b/light/service.cpp @@ -1,6 +1,6 @@ /* # -# Copyright 2018 The Android Open Source Project +# Copyright (C) 2018 The Xiaomi-SDM660 Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,6 +13,13 @@ # 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. + +# +# This file sets variables that control the way modules are built +# thorughout the system. It should not be used to conditionally +# disable makefiles (the proper mechanism to control what gets +# included in a build is to use PRODUCT_PACKAGES in a product +# definition file). # */ diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 2064539..0a02ec4 100755 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -1,7 +1,7 @@