summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2014-12-21 10:55:01 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2015-01-26 15:57:28 +0800
commitee4bc2ef69174b68c620aaf2143bf6abba3cb09a (patch)
tree066af6fd376a8474989c2f2ca308ef4746d3dbe2
parent50f2ac03811d89f7acae5021dcd834436bc83d03 (diff)
downloadandroid-patchsets-LCR-15.01-release.tar.gz
README.TXT: add README to describe how to this repositoryLCR-15.01-release
add description about which patches we should inclued here, and how to apply patches here. also rename LOLLIPOP-EXPERIMENTAL-PATCHSET to LOLLIPOP-STABLE-PATCHSET, and make a link LOLLIPOP-EXPERIMENTAL-PATCHSET to LOLLIPOP-STABLE-PATCHSET so that the builds will work without any change Change-Id: Icc57be595a5bdbc2df6e48f7a7d801952e732f8b Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rwxr-xr-xLOLLIPOP-STABLE-PATCHSET13
-rw-r--r--README.TXT50
2 files changed, 63 insertions, 0 deletions
diff --git a/LOLLIPOP-STABLE-PATCHSET b/LOLLIPOP-STABLE-PATCHSET
index b6bec91..1f5d8a5 100755
--- a/LOLLIPOP-STABLE-PATCHSET
+++ b/LOLLIPOP-STABLE-PATCHSET
@@ -15,14 +15,27 @@ if ! [ -d "$AOSP" ] && ! [ -d "$AOSP/bionic" ] && [ -d "$AOSP"/build ]; then
exit 1
fi
+##################################################
+################ Non-upstreamable ################
+##################################################
# Include bionic tests patch http://review.android.git.linaro.org/#/c/15288/
apply --linaro system/extras 15288/1
+##################################################
+################ Backport ########################
+##################################################
# Include fix for monkey crash on browser package:
# https://android-review.googlesource.com/#/c/118963
apply packages/apps/Browser 118963/1
+##################################################
+################ Temporary fix ###################
+##################################################
# Include patch for start and stop file path for bootchart:
# https://android-review.googlesource.com/#/c/117071/
apply --linaro system/core 15367/2
apply --linaro external/sepolicy 15366/2
+
+##################################################
+################ Linaro hack ###################
+##################################################
diff --git a/README.TXT b/README.TXT
new file mode 100644
index 0000000..9860da9
--- /dev/null
+++ b/README.TXT
@@ -0,0 +1,50 @@
+Linaro Android Patches Set Repository
+
+1. Patches should be here
+
+About what patches we should have here, please follow these rules.
+* Backport - backport of upstream accepted feature
+* Non-upstreamable feature - valid feature, wanted for products, but not going upstream (GTS patchset, of TuxOnIce, etc), maintained by Linaro forever.
+* Temporary fix - something that will get to upstream soon or will be fixed properly in upstream soon, but we just can't wait.
+* Linaro hack - something to get things working in our CI, on our HW, not going upstream. Ever. Members stay away.
+
+2. How to add patch into this repository
+
+* Submit your patch to Linaro Gerrit or Google Gerrit for review, but not merged
+ Linaro Gerrit: https://wiki.linaro.org/Platform/Android/GoodChanges
+ Google Gerrit: https://source.android.com/source/submit-patches.html
+
+* Add your patch information into following file:
+ AOSP-CLANG-PATCHSET: patches for building AOSP mater with Clang
+ AOSP-MASTER-EXPERIMENTAL-PATCHSET: patches for building AOSP mater branch
+ LOLLIPOP-CLANG-PATCHSET: patches for building AOSP Lollipop with Clang
+ LOLLIPOP-STABLE-PATCHSET: patches for building AOSP Lollipop version
+ LOLLIPOP-GCC49: TBU
+
+ PLEASE NOTE: please add description here when you add new patchset file.
+
+* About apply function:
+ please see LOLLIPOP-EXPERIMENTAL-PATCHSET as example,
+ and see the functions for details.
+
+ ## use patch from Linaro Gerrit:
+ apply --linaro system/extras 15288/1
+
+ ## use patch from Google Gerrit:
+ apply packages/apps/Browser 118963/1
+
+ "--linaro" here means using linaro gerrit server, you can use "--server" to
+ specify your own gerrit server as well, when no option specified, we will use
+ google gerrit server as default.
+
+ "system/extras" and "packages/apps/Browser" are the project repository pathes
+ which is after the gerrit server prefix.
+ linaro gerrit server prefix: git://review.android.git.linaro.org/
+ google gerrit server prefix: https://android.googlesource.com/
+
+ "15288" and "118963" are the review ids of the gerrit review url
+
+ "1" here is the patchset number of your patch on the gerrit server.
+
+3. Others
+ TBU