Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
This commit is contained in:
Wolfgang Wiedmeyer 2017-02-12 19:41:06 +01:00
commit 64dba5e9e2
No known key found for this signature in database
GPG Key ID: 5816A24C10757FC4
43 changed files with 308 additions and 95 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
proprietary/*
prebuilt/common/apps/
prebuilt/archive
*~

View File

@ -172,12 +172,12 @@ Galaxy Note 2 (N7100):
* Sensors working
* Camera working (back)
CyanogenMod
LineageOS
===============
Visit http://github.com/CyanogenMod for full source and git access.
Visit http://github.com/LineageOS for full source and git access.
Visit http://review.cyanogenmod.org for our Gerrit instance.
Visit http://review.lineageos.org for our Gerrit instance.
CHANGELOG (notable new features)
---------

View File

@ -3,15 +3,16 @@ Replicant
A non-exhaustive list of people involved in Replicant is available at: http://redmine.replicant.us/projects/replicant/wiki/People
CyanogenMod
LineageOS
===========
Maintainers (CyanogenMod 13.0):
Maintainers (LineageOS 13.0):
-----------------------------
* __Acer A700:__ pawitp
* __Alcatel Idol 3:__ c457
* __Amazon Kindle Fire 1st Edition:__ Hashcode, FuZZ__
* __Amazon Kindle Fire 2nd Edition:__ Hashcode, FuZZ__
* __ARK Benefit A3 (peach):__ lolmaxlik
* __Asus EeePad Transformer (TF101):__ Bumble-Bee, EnJens
* __Asus EeePad Transformer Prime (TF201):__ Bumble-Bee, EnJens
* __Asus EeePad Transformer Pad TF300T:__ chrmhoffmann
@ -58,6 +59,7 @@ Maintainers (CyanogenMod 13.0):
* __HTC One XL:__ h8rift, intervigil, jrior001
* __Huawei Ascend Mate 2:__ mdmower, u-ra
* __Huawei Honor 4/4X (cherry):__ dianlujitao, surdupetru, desalesouche
* __LeEco Le 2 (s2):__ codeworkx
* __LG G2 (AT&T) (D800):__ arcee, Rashed97, Shelnutt2
* __LG G2 (T-Mobile) (D801):__ arcee, Rashed97, Shelnutt2
* __LG G2 (International) (D802):__ arcee, Rashed97, Shelnutt2
@ -80,7 +82,6 @@ Maintainers (CyanogenMod 13.0):
* __LG Optimus L90:__ Quarx2k, vm03, NikitaProAndroid
* __LG Optimus LTE (P930) / LG Nitro HD {P935):__ arcee
* __LG Optimus LTE (SK Telecom) (SU640):__ arcee
* __LG V10 (T-Mobile) (H901):__ genesixxbf3
* __Moto E 2014 (xt1021,xt1022,xt1023/condor):__
* __Moto G 2014 (xt1063,xt1064,xt1068,xt1069/titan):__ LuK1337, luca020400
* __Moto G 4G (xt1039,xt1040,xt1042,xt1045/peregrine):__ somcom3x, intervigil

View File

@ -1,4 +1,5 @@
Copyright 2011-15 The CyanogenMod Project
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.

View File

@ -19,12 +19,12 @@ Copying
Replicant is made of free software, owned by various copyright holders and released under various free software licenses.
Please refer to the source code of each component for specific details.
CyanogenMod
LineageOS
===========
Submitting Patches
------------------
Patches are always welcome! Please submit your patches via CyanogenMod Gerrit!
Patches are always welcome! Please submit your patches via LineageOS Gerrit!
You can do this by using these commands:
(From root android directory)
@ -41,31 +41,31 @@ For more help on using this tool, use this command: repo help upload
Make your changes and commit with a detailed message, starting with what you are working with (i.e. vision: Update Kernel)
Commit your patches in a single commit. Squash multiple commit using this command: git rebase -i HEAD~<# of commits>
To view the status of your and others' patches, visit [CyanogenMod Code Review](http://review.cyanogenmod.org/)
To view the status of your and others' patches, visit [LineageOS Code Review](http://review.lineageos.org/)
Getting Started
---------------
To get started with Android/CyanogenMod, you'll need to get
To get started with Android/LineageOS, you'll need to get
familiar with [Repo](https://source.android.com/source/using-repo.html) and [Version Control with Git](https://source.android.com/source/version-control.html).
To initialize your local repository using the CyanogenMod trees, use a command like this:
To initialize your local repository using the LineageOS trees, use a command like this:
repo init -u git://github.com/CyanogenMod/android.git -b cm-13.0
repo init -u git://github.com/LineageOS/android.git -b cm-13.0
Then to sync up:
repo sync
Please see the [CyanogenMod Wiki](http://wiki.cyanogenmod.org/) for building instructions, by device.
Please see the [LineageOS Wiki](http://wiki.lineageos.org/) for building instructions, by device.
For more information on this Github Organization and how it is structured,
please [read the wiki article](http://wiki.cyanogenmod.org/w/Github_Organization)
please [read the wiki article](http://wiki.lineageos.org/w/Github_Organization)
Buildbot
--------
All supported devices are built nightly and periodically as changes are committed to ensure the source trees remain buildable.
You can view the current build statuses in the [Jenkins](http://jenkins.cyanogenmod.org) tool.
You can view the current build statuses in the [Jenkins](http://jenkins.lineageos.org) tool.

53
bootanimation/Android.mk Normal file
View File

@ -0,0 +1,53 @@
#
# Copyright (C) 2016 The CyanogenMod Project
# 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.
#
define build-bootanimation
sh vendor/cm/bootanimation/generate-bootanimation.sh \
$(TARGET_SCREEN_WIDTH) \
$(TARGET_SCREEN_HEIGHT) \
$(TARGET_BOOTANIMATION_HALF_RES)
endef
TARGET_GENERATED_BOOTANIMATION := $(TARGET_OUT_INTERMEDIATES)/BOOTANIMATION/bootanimation.zip
$(TARGET_GENERATED_BOOTANIMATION):
@echo "Building bootanimation"
$(build-bootanimation)
ifeq ($(TARGET_BOOTANIMATION),)
TARGET_BOOTANIMATION := $(TARGET_GENERATED_BOOTANIMATION)
ifeq ($(shell command -v mogrify),)
$(info **********************************************)
$(info The boot animation could not be generated as)
$(info ImageMagick is not installed in your system.)
$(info $(space))
$(info Please install ImageMagick from this website:)
$(info https://imagemagick.org/script/binary-releases.php)
$(info **********************************************)
$(error stop)
endif
endif
include $(CLEAR_VARS)
LOCAL_MODULE := bootanimation.zip
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT)/media
include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): $(TARGET_BOOTANIMATION)
@mkdir -p $(dir $@)
@cp $(TARGET_BOOTANIMATION) $@

View File

@ -0,0 +1,17 @@
#
# 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.
#
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/BOOTANIMATION)

Binary file not shown.

5
bootanimation/desc.txt Normal file
View File

@ -0,0 +1,5 @@
c 1 0 part0
c 0 0 part1
c 1 0 part2
c 1 1 part3
c 1 0 part4

View File

@ -0,0 +1,39 @@
#!/bin/bash
WIDTH="$1"
HEIGHT="$2"
HALF_RES="$3"
OUT="$ANDROID_PRODUCT_OUT/obj/BOOTANIMATION"
if [ "$HEIGHT" -lt "$WIDTH" ]; then
IMAGEWIDTH="$HEIGHT"
else
IMAGEWIDTH="$WIDTH"
fi
IMAGESCALEWIDTH="$IMAGEWIDTH"
IMAGESCALEHEIGHT=$(expr $IMAGESCALEWIDTH / 3)
if [ "$HALF_RES" = "true" ]; then
IMAGEWIDTH=$(expr $IMAGEWIDTH / 2)
fi
IMAGEHEIGHT=$(expr $IMAGEWIDTH / 3)
RESOLUTION=""$IMAGEWIDTH"x"$IMAGEHEIGHT""
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/"
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"
# Create bootanimation.zip
cd "$OUT/bootanimation"
zip -qr0 "$OUT/bootanimation.zip" .

View File

@ -4,7 +4,7 @@ You have tried to change the API from what has been previously approved.
STOP.
Read this:
https://github.com/CyanogenMod/cm_platform_sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api
https://github.com/LineageOS/cm_platform_sdk/wiki/Creating-an-API-for-the-SDK#updating--verifying-the-api
To make these errors go away, you have two choices:
1) You can add "@hide" javadoc comments to the methods, etc. listed in the
@ -142,6 +142,6 @@ To make these errors go away, you have two choices:
,;+++++++++++++++++++++++++++++++++++++++++++++++++++++++:.
..,;;+++++++++++++++++++++++++++++;:,.
To submit the revised current.txt to the main CyanogenMod repository,
To submit the revised current.txt to the main LineageOS repository,
you will need approval.
******************************

View File

@ -1,4 +1,5 @@
# Copyright (C) 2015 The CyanogenMod Project
# (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.
@ -26,3 +27,5 @@ FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/replicant/build/core/apich
BUILD_MAVEN_PREBUILT := $(TOP)/vendor/replicant/build/core/maven_artifact.mk
PUBLISH_MAVEN_PREBUILT := $(TOP)/vendor/replicant/build/core/maven_artifact_publish.mk
BUILD_HTTP_PREBUILT := $(TOP)/vendor/replicant/build/core/http_prebuilt.mk

View File

@ -0,0 +1,89 @@
# Copyright (C) 2015 The CyanogenMod Project
# (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.
ifeq ($(strip $(LOCAL_HTTP_PATH)),)
$(error LOCAL_HTTP_PATH not defined.)
endif
ifeq ($(strip $(LOCAL_HTTP_FILENAME)),)
$(error LOCAL_HTTP_FILENAME not defined.)
endif
ifeq ($(strip $(LOCAL_HTTP_MD5SUM)),)
$(error LOCAL_HTTP_MD5SUM not defined.)
endif
PREBUILT_MODULE_ARCHIVE := vendor/cm/prebuilt/archive/$(LOCAL_MODULE)
PREBUILT_MODULE_FILE := $(PREBUILT_MODULE_ARCHIVE)/$(LOCAL_HTTP_FILENAME)
PREBUILT_MODULE_MD5SUM := $(PREBUILT_MODULE_ARCHIVE)/md5sum
HTTP_FILE_URL := $(LOCAL_HTTP_PATH)/$(LOCAL_HTTP_FILENAME)
HTTP_FILE_MD5_URL := $(LOCAL_HTTP_PATH)/$(LOCAL_HTTP_MD5SUM)
LOCAL_PREBUILT_MODULE_FILE := $(call intermediates-dir-for,$(LOCAL_MODULE_CLASS),$(LOCAL_MODULE),,COMMON)/$(LOCAL_HTTP_FILENAME)
$(LOCAL_PREBUILT_MODULE_FILE): filename := $(LOCAL_HTTP_FILENAME)
$(LOCAL_PREBUILT_MODULE_FILE): checksum := $(PREBUILT_MODULE_MD5SUM)
$(LOCAL_PREBUILT_MODULE_FILE): filepath := $(PREBUILT_MODULE_FILE)
$(LOCAL_PREBUILT_MODULE_FILE): version := $(LOCAL_HTTP_FILE_VERSION)
define curl-checksum
@echo "Pulling comparison md5sum for $(filename)"
$(call download-prebuilt-module, $(HTTP_FILE_MD5_URL),$(checksum))
endef
define audit-checksum
$(hide) if [ ! -f $(filepath) ]; then \
echo "Downloading: $(filename) (version $(version)) -> $(filepath)"; \
$(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \
else \
temp_checksum=$(shell md5sum $(filepath) | cut -d ' ' -f1); \
if [ "$$temp_checksum" != "$(shell cat $(checksum) | cut -d ' ' -f1)" ]; then \
echo "Downloading: $(filename) (version $(version)) -> $(filepath)"; \
rm -rf $(filepath); \
$(call download-prebuilt-module, $(HTTP_FILE_URL),$(filepath)) \
fi; \
fi; \
rm -f $(checksum);
endef
# $(1) url
# $(2) file output
define download-prebuilt-module
./vendor/cm/build/tasks/http_curl_prebuilt.sh $(1) $(2);
endef
define cleanup
@echo "Copying: $(filename) -> $(dir $@)"
$(hide) mkdir -p $(dir $@)
$(hide) cp $(filepath) $(dir $@)/$(filename)
endef
$(LOCAL_PREBUILT_MODULE_FILE):
$(call curl-checksum)
$(call audit-checksum)
$(call cleanup)
include $(BUILD_PREBUILT)
# the "fetchprebuilts" target will go through and pre-download all of the maven dependencies in the tree
fetchprebuilts: $(LOCAL_PREBUILT_MODULE_FILE)
# the "nukeprebuilts" target will evict all archived artifacts
nukeprebuilts:
@echo "Removing artifact for $(LOCAL_HTTP_FILENAME)"
$(hide) rm -rf $(PREBUILT_MODULE_ARCHIVE)

View File

@ -0,0 +1,6 @@
#!/bin/bash
url=$1
output=$2
curl -L "$url" --create-dirs -o $output --compressed -H "Accept-Encoding: gzip,deflate,sdch" && exit 0 || exit 1

View File

@ -429,12 +429,35 @@ function write_product_packages() {
# be executed first!
#
function write_header() {
if [ -f $1 ]; then
rm $1
fi
YEAR=$(date +"%Y")
[ "$COMMON" -eq 1 ] && local DEVICE="$DEVICE_COMMON"
cat << EOF > $1
# Copyright (C) $YEAR The CyanogenMod Project
NUM_REGEX='^[0-9]+$'
if [[ $INITIAL_COPYRIGHT_YEAR =~ $NUM_REGEX ]] && [ $INITIAL_COPYRIGHT_YEAR -le $YEAR ]; then
if [ $INITIAL_COPYRIGHT_YEAR -lt 2016 ]; then
printf "# Copyright (C) $INITIAL_COPYRIGHT_YEAR-2016 The CyanogenMod Project\n" > $1
elif [ $INITIAL_COPYRIGHT_YEAR -eq 2016 ]; then
printf "# Copyright (C) 2016 The CyanogenMod Project\n" > $1
fi
if [ $YEAR -eq 2017 ]; then
printf "# Copyright (C) 2017 The LineageOS Project\n" >> $1
elif [ $INITIAL_COPYRIGHT_YEAR -eq $YEAR ]; then
printf "# Copyright (C) $YEAR The LineageOS Project\n" >> $1
elif [ $INITIAL_COPYRIGHT_YEAR -le 2017 ]; then
printf "# Copyright (C) 2017-$YEAR The LineageOS Project\n" >> $1
else
printf "# Copyright (C) $INITIAL_COPYRIGHT_YEAR-$YEAR The LineageOS Project\n" >> $1
fi
else
printf "# Copyright (C) $YEAR The LineageOS Project\n" > $1
fi
cat << EOF >> $1
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -761,7 +784,9 @@ function extract() {
echo "Cleaning output directory ($OUTPUT_ROOT).."
rm -rf "${OUTPUT_TMP:?}"
mkdir -p "${OUTPUT_TMP:?}"
mv "${OUTPUT_ROOT:?}/"* "${OUTPUT_TMP:?}/"
if [ -d "$OUTPUT_ROOT" ]; then
mv "${OUTPUT_ROOT:?}/"* "${OUTPUT_TMP:?}/"
fi
VENDOR_STATE=1
fi

1
build/tools/repopick.py Symbolic link
View File

@ -0,0 +1 @@
../../../../build/tools/repopick.py

View File

@ -44,13 +44,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
endif
PRODUCT_PROPERTY_OVERRIDES += \
keyguard.no_require_sim=true \
ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html \
ro.com.android.wifi-watchlist=GoogleGuest \
ro.setupwizard.enterprise_mode=1 \
ro.com.android.dateformat=MM-dd-yyyy \
ro.com.android.dataroaming=false
keyguard.no_require_sim=true
PRODUCT_PROPERTY_OVERRIDES += \
ro.build.selinux=1
@ -154,7 +148,6 @@ PRODUCT_PACKAGES += \
# Custom packages
PRODUCT_PACKAGES += \
Launcher3 \
Trebuchet \
AudioFX \
ReplicantWallpapers \
@ -250,12 +243,14 @@ PRODUCT_PROPERTY_OVERRIDES += \
ifneq ($(TARGET_BUILD_VARIANT),user)
PRODUCT_PACKAGES += \
procmem \
procrank \
procrank
# Conditionally build in su
ifeq ($(WITH_SU),true)
PRODUCT_PACKAGES += \
su
endif
PRODUCT_PROPERTY_OVERRIDES += \
persist.sys.root_access=0
endif
DEVICE_PACKAGE_OVERLAYS += vendor/replicant/overlay/common

View File

@ -1,7 +1,2 @@
# Inherit common CM stuff
$(call inherit-product, vendor/cm/config/common_full.mk)
ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
PRODUCT_COPY_FILES += \
vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
endif

View File

@ -1,7 +1,2 @@
# Inherit common CM stuff
$(call inherit-product, vendor/cm/config/common_mini.mk)
ifeq ($(TARGET_SCREEN_WIDTH) $(TARGE