OSDN Git Service
Chih-Wei Huang [Wed, 12 Jul 2017 02:58:30 +0000 (10:58 +0800)]
Merge tag 'android-7.1.2_r27' into nougat-x86
Android 7.1.2 release 27
Chih-Wei Huang [Wed, 7 Jun 2017 03:14:25 +0000 (11:14 +0800)]
Merge tag 'android-7.1.2_r17' into nougat-x86
Android 7.1.2 Release 17 (NJH47B)
Chih-Wei Huang [Thu, 25 May 2017 07:52:23 +0000 (15:52 +0800)]
kernel.mk: set toolchain for 64-bit kernel
android-build-team Robot [Thu, 25 May 2017 23:42:36 +0000 (23:42 +0000)]
Version bump to NZH54B
Change-Id: Iebb6d3ebfd34f9f439f2b32bf080b74d1f7686c2
Chih-Wei Huang [Thu, 25 May 2017 07:51:32 +0000 (15:51 +0800)]
Revert "kernel.mk: fix the linking error of kernel 4.9"
This reverts commit
921502586dcd742a469ceb85687d0a4ecdd9178d.
android-build-team Robot [Wed, 24 May 2017 22:53:53 +0000 (22:53 +0000)]
Make change and version bump to NZH54
Adam Seaton [Wed, 17 May 2017 18:27:05 +0000 (11:27 -0700)]
[DO NOT MERGE]Updating security string to 2017-07-05 on nyc-dev
bug:
38342695
(cherry picked from commit
96d958c34509a65e5f7787945f9923fb44c42f05)
Change-Id: I639cd5243d7a80cbf9e6c3581bb038389c28adad
Adam Seaton [Wed, 17 May 2017 18:24:52 +0000 (11:24 -0700)]
[DO NOT MERGE]Updating security string to 2017-07-01 on nyc-dev
bug:
38342695
(cherry picked from commit
77dad3dfcd677136f6657e1b95dd84ed1be1d728)
Change-Id: I7c6cb060fb740d44a566450122a9035f7bd9d5f5
Thomas Joseph Avila [Tue, 23 May 2017 19:27:13 +0000 (12:27 -0700)]
NZH34C
android-build-team Robot [Thu, 18 May 2017 00:56:09 +0000 (00:56 +0000)]
Version bump to NJH47B
Change-Id: I04b0907a56d5db287bf0426c67bebdcac2680bd4
android-build-team Robot [Wed, 17 May 2017 22:58:40 +0000 (22:58 +0000)]
Make change and version bump to NJH47
android-build-team Robot [Wed, 17 May 2017 19:48:02 +0000 (19:48 +0000)]
Version bump to NJH34C
Change-Id: I465448ca73efddaca59ff12ad9fff98c3b8b6455
android-build-team Robot [Thu, 11 May 2017 19:13:52 +0000 (19:13 +0000)]
Make change and version bump to NJH34B
Adam Seaton [Tue, 11 Apr 2017 18:04:34 +0000 (11:04 -0700)]
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
Change-Id: If3756886a04faef5fc92c52e30829ccb3be29686
android-build-team Robot [Thu, 4 May 2017 22:06:45 +0000 (22:06 +0000)]
Make change and version bump to NJH34
android-build-team Robot [Thu, 4 May 2017 22:06:22 +0000 (22:06 +0000)]
release-request-
3b995630-3bae-4f9e-868a-
935ab7740cc9-for-git_nyc-mr2-pixel-monthly-release-
3934930 snap-temp-L20000000060688928 (snap-temp-branch)
Change-Id: I864aad29f06ed1a4a044980bff729d0099537cf1
Chih-Wei Huang [Thu, 4 May 2017 06:37:06 +0000 (14:37 +0800)]
Merge tag 'android-7.1.2_r11' into nougat-x86
Android 7.1.2 release 11
Xuefer [Sat, 29 Apr 2017 07:42:24 +0000 (15:42 +0800)]
kernel.mk: enable ccache support
Signed-off-by: Xuefer <xuefer@gmail.com>
Chih-Wei Huang [Tue, 7 Mar 2017 12:18:37 +0000 (20:18 +0800)]
kernel.mk: fix the linking error of kernel 4.9
Use ld.bfd instead of ld.gold from the -androidkernel- toolchain.
Chih-Wei Huang [Wed, 24 Aug 2016 12:37:38 +0000 (20:37 +0800)]
kernel.mk: fix building errors on Android 7.0
Chih-Wei Huang [Fri, 19 Aug 2016 03:50:52 +0000 (11:50 +0800)]
kernel.mk: wl: support newer kernel (4.6+)
Jaap Jan Meijer [Mon, 15 Aug 2016 20:15:51 +0000 (22:15 +0200)]
Do not call assert-max-image-size when system image size is calculated automatically
When BOARD_SYSTEMIMAGE_PARTITION_SIZE is set to 0 the system image size is calculated
automatically, it does not make sense to call assert-max-image-size and it will fail.
Zhao Wei Liew [Mon, 8 Aug 2016 23:24:10 +0000 (07:24 +0800)]
build: Allow both OpenJDK and OracleJDK by default
Some users would like to build with Oracle JDK on Linux,
while others would like to build with OpenJDK on Darwin.
CM should build fine with either configuration, so drop
the OpenJDK checks to allow both of them.
Change-Id: I64d7887c2fab4dd301b07d7df0d19f28e97d80ab
Chih-Wei Huang [Sun, 5 Jun 2016 09:47:53 +0000 (17:47 +0800)]
kernel.mk: allow to specify the kernel compiler
Chih-Wei Huang [Sun, 5 Jun 2016 09:46:22 +0000 (17:46 +0800)]
android-x86: remove power.default
Chih-Wei Huang [Mon, 18 Jan 2016 05:17:07 +0000 (13:17 +0800)]
Add target BoardConfig.mk as a prerequisite of build.prop
The BoardConfig.mk may define TARGET_CPU_ABI_LIST related variables
which affect the build.prop.
Chih-Wei Huang [Tue, 12 Jan 2016 10:06:26 +0000 (18:06 +0800)]
kernel.mk: split wl driver rules into another makefile
Two purposes for this change:
* Centralize the wl related files into the wl subdirectory
* Can simply ignore wl driver on porting new kernel
Chih-Wei Huang [Thu, 15 Oct 2015 17:43:17 +0000 (01:43 +0800)]
android-x86: add kernel building rules
Change-Id: I6b67229c735dacc73fe83a2a9937abdbf4a0c423
Chih-Wei Huang [Wed, 21 Jan 2015 04:27:35 +0000 (12:27 +0800)]
android-x86: remove audio.primary.default
We don't need the dummy hal.
Chih-Wei Huang [Tue, 20 May 2014 09:08:36 +0000 (17:08 +0800)]
Do not stash BOARD_SYSTEMIMAGE_PARTITION_SIZE
It's calculated later in our mkuserimg.sh.
Chih-Wei Huang [Wed, 16 Mar 2011 02:37:30 +0000 (10:37 +0800)]
android-x86: add rules to generate system.sfs
android-build-team Robot [Tue, 25 Apr 2017 17:25:48 +0000 (17:25 +0000)]
Make change and version bump to NJH25B
Adam Seaton [Tue, 11 Apr 2017 18:04:34 +0000 (11:04 -0700)]
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
Change-Id: I6ce9326f366fbad1f845fd22d045569fe4f09a09
android-build-team Robot [Tue, 25 Apr 2017 17:14:49 +0000 (17:14 +0000)]
Make change and version bump to NJH25
android-build-team Robot [Tue, 25 Apr 2017 17:14:27 +0000 (17:14 +0000)]
release-request-
1b405be0-1652-4c5c-a4e4-
f5799a530db2-for-git_nyc-mr2-pixel-monthly-release-
3934930 snap-temp-L15900000057606206 (snap-temp-branch)
Change-Id: I5c2f6a3780a4bb3b6a869decca2840cec5828efc
The Android Automerger [Mon, 24 Apr 2017 19:23:18 +0000 (12:23 -0700)]
N2G47W
android-build-team Robot [Fri, 21 Apr 2017 21:19:03 +0000 (21:19 +0000)]
Version bump to NJH21D
Change-Id: If7402e75597b8d24746e285ab8edefa0f1a37546
android-build-team Robot [Fri, 21 Apr 2017 21:09:25 +0000 (21:09 +0000)]
Make change and version bump to NJH21C
Adam Seaton [Tue, 11 Apr 2017 18:04:34 +0000 (11:04 -0700)]
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
Change-Id: I283f8a3be0d23373c9c099e81955a5de6f120a1a
android-build-team Robot [Fri, 21 Apr 2017 20:41:58 +0000 (20:41 +0000)]
Make change and version bump to NJH21B
Adam Seaton [Tue, 11 Apr 2017 18:03:48 +0000 (11:03 -0700)]
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
Change-Id: Id528161f61eeb3987d6b90069ede80b1aed2bfba
android-build-team Robot [Fri, 21 Apr 2017 17:29:42 +0000 (17:29 +0000)]
Make change and version bump to NJH21
android-build-team Robot [Thu, 20 Apr 2017 22:40:36 +0000 (22:40 +0000)]
Make change and version bump to NJH20
Adam Seaton [Tue, 11 Apr 2017 18:03:48 +0000 (11:03 -0700)]
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
Change-Id: I8cdfa17bb6eb1c4cfb87a85169ba082d74975d63
gitbuildkicker [Mon, 17 Apr 2017 23:24:34 +0000 (16:24 -0700)]
N2G47V
Adam Seaton [Tue, 11 Apr 2017 18:04:34 +0000 (11:04 -0700)]
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev
bug:
37204197
Change-Id: I9790487cd9bf8fb8e44856216407b35d067a9d16
(cherry picked from commit
70d708e29ff733778771deae004ec06dca419efb)
Adam Seaton [Tue, 11 Apr 2017 18:03:48 +0000 (11:03 -0700)]
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev
bug:
37204197
Change-Id: I81ae6196028c983baf82800a364805025672bec9
(cherry picked from commit
d9a5e995999d15175efba49e01a0844fe9d5cf84)
gitbuildkicker [Mon, 17 Apr 2017 23:09:42 +0000 (16:09 -0700)]
merge in nyc-mr2-release history after reset to
189e63df8681345b82b0a71b625a62face1b3b4e
gitbuildkicker [Wed, 12 Apr 2017 18:09:26 +0000 (11:09 -0700)]
N2G47U
gitbuildkicker [Mon, 10 Apr 2017 18:21:39 +0000 (11:21 -0700)]
N2G47T
gitbuildkicker [Mon, 10 Apr 2017 18:12:22 +0000 (11:12 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Thu, 6 Apr 2017 22:18:55 +0000 (15:18 -0700)]
NHG47L
Adam Seaton [Fri, 10 Mar 2017 23:44:57 +0000 (15:44 -0800)]
Update Security String to 2017-05-05 on nyc-dev
Bug:
34137924
(cherry picked from commit
cfdcc41cd73360c9605407508a285c905d196fd5)
Adam Seaton [Fri, 10 Mar 2017 23:44:16 +0000 (15:44 -0800)]
Update Security String to 2017-05-01 on nyc-dev
Bug:
34137924
(cherry picked from commit
573e7e75cab017946716fbd4ba01cbd8e7563478)
gitbuildkicker [Mon, 3 Apr 2017 22:00:34 +0000 (15:00 -0700)]
N2G47S
gitbuildkicker [Thu, 30 Mar 2017 23:18:06 +0000 (16:18 -0700)]
N2G47R
gitbuildkicker [Thu, 30 Mar 2017 23:17:04 +0000 (16:17 -0700)]
merge in nyc-mr2-release history after reset to
72c9cf9ea858b1ad929a983ff88ec0220c71f692
gitbuildkicker [Thu, 30 Mar 2017 18:46:27 +0000 (11:46 -0700)]
N2G47Q
gitbuildkicker [Thu, 30 Mar 2017 18:44:56 +0000 (11:44 -0700)]
merge in nyc-mr2-release history after reset to
5bc868310c7197bfe40aec00ca8152a488992fbf
android-merger [Thu, 30 Mar 2017 15:28:30 +0000 (08:28 -0700)]
NHG47K
gitbuildkicker [Thu, 30 Mar 2017 00:26:48 +0000 (17:26 -0700)]
N2G47P
gitbuildkicker [Mon, 27 Mar 2017 18:10:18 +0000 (11:10 -0700)]
N2G47O
gitbuildkicker [Mon, 27 Mar 2017 18:10:08 +0000 (11:10 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Thu, 23 Mar 2017 21:42:48 +0000 (14:42 -0700)]
N2G47N
kuantung [Thu, 23 Mar 2017 21:29:47 +0000 (14:29 -0700)]
NHG47J
The Android Automerger [Thu, 23 Mar 2017 02:45:55 +0000 (19:45 -0700)]
N2G47M
gitbuildkicker [Thu, 23 Mar 2017 01:55:34 +0000 (18:55 -0700)]
N2G47L
gitbuildkicker [Wed, 22 Mar 2017 22:02:10 +0000 (15:02 -0700)]
N2G47K
Adam Seaton [Fri, 10 Mar 2017 23:44:57 +0000 (15:44 -0800)]
Update Security String to 2017-05-05 on nyc-dev
Bug:
34137924
(cherry picked from commit
cfdcc41cd73360c9605407508a285c905d196fd5)
Adam Seaton [Fri, 10 Mar 2017 23:44:16 +0000 (15:44 -0800)]
Update Security String to 2017-05-01 on nyc-dev
Bug:
34137924
(cherry picked from commit
573e7e75cab017946716fbd4ba01cbd8e7563478)
gitbuildkicker [Wed, 22 Mar 2017 19:07:41 +0000 (12:07 -0700)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Mon, 20 Mar 2017 17:58:43 +0000 (10:58 -0700)]
N2G47J
gitbuildkicker [Wed, 8 Mar 2017 22:41:19 +0000 (14:41 -0800)]
N2G47I
gitbuildkicker [Fri, 3 Mar 2017 21:30:33 +0000 (13:30 -0800)]
N2G47H
gitbuildkicker [Wed, 1 Mar 2017 15:18:15 +0000 (07:18 -0800)]
N2G47G
gitbuildkicker [Mon, 27 Feb 2017 19:02:33 +0000 (11:02 -0800)]
N2G47F
gitbuildkicker [Sat, 25 Feb 2017 01:43:32 +0000 (17:43 -0800)]
N2G47E
gitbuildkicker [Thu, 23 Feb 2017 18:23:22 +0000 (10:23 -0800)]
N2G47D
gitbuildkicker [Fri, 17 Feb 2017 21:11:57 +0000 (13:11 -0800)]
N2G47C
gitbuildkicker [Thu, 16 Feb 2017 22:44:40 +0000 (14:44 -0800)]
N2G47B
gitbuildkicker [Thu, 16 Feb 2017 08:10:25 +0000 (00:10 -0800)]
N2G47
gitbuildkicker [Thu, 16 Feb 2017 08:08:33 +0000 (00:08 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Wed, 15 Feb 2017 08:11:11 +0000 (00:11 -0800)]
N2G46
gitbuildkicker [Wed, 15 Feb 2017 08:08:26 +0000 (00:08 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
gitbuildkicker [Tue, 14 Feb 2017 08:10:22 +0000 (00:10 -0800)]
N2G45
gitbuildkicker [Tue, 14 Feb 2017 08:08:30 +0000 (00:08 -0800)]
merge in nyc-mr2-release history after reset to nyc-mr2-dev
Adam Seaton [Mon, 13 Feb 2017 23:49:18 +0000 (23:49 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am:
502366cdc4 am:
3ce29b8a94 am:
b0cef41b76 -s ours am:
8f86884a97 -s ours am:
c901cec8b2 am:
a150db6547 -s ours am:
28ecd6fdd5 am:
58300f46bf am:
764c206e6d am:
533ca31c93 -s ours am:
4a18b463ab am:
1cfaef4241 am:
4fae3e67ef
am:
3ce06ee405
Change-Id: Idd8f15408a015abd101ac272a1cae24aeee144a2
Adam Seaton [Mon, 13 Feb 2017 23:49:11 +0000 (23:49 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am:
00c627eb31 am:
5be6d3bbb4 am:
ed38784898 -s ours am:
84702d9919 -s ours am:
d466175346 am:
bc19d8140c -s ours am:
53a64664c9 am:
caff84dcbe am:
2f222829e0 am:
69586d29d7 -s ours am:
8f510b8ca1 am:
34f2511b65 am:
8bc2b6dc86
am:
e62cac071f
Change-Id: I0832e83c9c8b992ce781a2762e812be601363e5f
Adam Seaton [Mon, 13 Feb 2017 23:46:46 +0000 (23:46 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am:
502366cdc4 am:
3ce29b8a94 am:
b0cef41b76 -s ours am:
8f86884a97 -s ours am:
c901cec8b2 am:
a150db6547 -s ours am:
28ecd6fdd5 am:
58300f46bf am:
764c206e6d am:
533ca31c93 -s ours am:
4a18b463ab am:
1cfaef4241
am:
4fae3e67ef
Change-Id: Ide31be66e4839fdd68aa0951d053867a12438593
Adam Seaton [Mon, 13 Feb 2017 23:46:39 +0000 (23:46 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am:
00c627eb31 am:
5be6d3bbb4 am:
ed38784898 -s ours am:
84702d9919 -s ours am:
d466175346 am:
bc19d8140c -s ours am:
53a64664c9 am:
caff84dcbe am:
2f222829e0 am:
69586d29d7 -s ours am:
8f510b8ca1 am:
34f2511b65
am:
8bc2b6dc86
Change-Id: Ic492a8cef30dd339e14180f9d31b151acf14df2c
Adam Seaton [Mon, 13 Feb 2017 23:43:47 +0000 (23:43 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am:
502366cdc4 am:
3ce29b8a94 am:
b0cef41b76 -s ours am:
8f86884a97 -s ours am:
c901cec8b2 am:
a150db6547 -s ours am:
28ecd6fdd5 am:
58300f46bf am:
764c206e6d am:
533ca31c93 -s ours am:
4a18b463ab
am:
1cfaef4241
Change-Id: I0e5fc301e64ed9c0e6055a180b53c479294cd072
Adam Seaton [Mon, 13 Feb 2017 23:43:46 +0000 (23:43 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am:
e2eff3f7ee -s ours am:
ea757ba690 am:
37aab729cf -s ours am:
8a59a2eda2 am:
3746e17d30 am:
b15a2623ac am:
4be162ac7f -s ours am:
c8b7e08b50 am:
3e0d1c32da am:
437c3dd5d3
am:
21f6e17ffd
Change-Id: Ie5dc35c61122cfee38b11f5f4471c75ee0839b79
Adam Seaton [Mon, 13 Feb 2017 23:43:39 +0000 (23:43 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am:
00c627eb31 am:
5be6d3bbb4 am:
ed38784898 -s ours am:
84702d9919 -s ours am:
d466175346 am:
bc19d8140c -s ours am:
53a64664c9 am:
caff84dcbe am:
2f222829e0 am:
69586d29d7 -s ours am:
8f510b8ca1
am:
34f2511b65
Change-Id: I561a133a3b4dffd00e572a4d78e48e9f5fb068a8
Adam Seaton [Mon, 13 Feb 2017 23:43:39 +0000 (23:43 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am:
ffab69998a -s ours am:
0f30aa9801 am:
05ebddebe5 -s ours am:
101c043b17 am:
58086ff4aa am:
fec9d76740 am:
ea0d4b0e54 -s ours am:
45deda3682 am:
235702c0e0 am:
6063089d07
am:
85782debf1
Change-Id: Icda57e24424782065e160a227e790b96fe8338e0
Adam Seaton [Mon, 13 Feb 2017 23:40:47 +0000 (23:40 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am:
e2eff3f7ee -s ours am:
ea757ba690 am:
37aab729cf -s ours am:
8a59a2eda2 am:
3746e17d30 am:
b15a2623ac am:
4be162ac7f -s ours am:
c8b7e08b50 am:
3e0d1c32da
am:
437c3dd5d3
Change-Id: I2f1bcd2e3c7e40013769429f2214188a82cd7ae9
Adam Seaton [Mon, 13 Feb 2017 23:40:47 +0000 (23:40 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am:
502366cdc4 am:
3ce29b8a94 am:
b0cef41b76 -s ours am:
8f86884a97 -s ours am:
c901cec8b2 am:
a150db6547 -s ours am:
28ecd6fdd5 am:
58300f46bf am:
764c206e6d am:
533ca31c93 -s ours
am:
4a18b463ab
Change-Id: Ia0b3eb95e0a8e3ed6f8abd5d9b36a081a62d9598
Adam Seaton [Mon, 13 Feb 2017 23:40:39 +0000 (23:40 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am:
00c627eb31 am:
5be6d3bbb4 am:
ed38784898 -s ours am:
84702d9919 -s ours am:
d466175346 am:
bc19d8140c -s ours am:
53a64664c9 am:
caff84dcbe am:
2f222829e0 am:
69586d29d7 -s ours
am:
8f510b8ca1
Change-Id: I76e4a8e5ef538561bdf93a0b62d5ebb9171288b3
Adam Seaton [Mon, 13 Feb 2017 23:40:39 +0000 (23:40 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am:
ffab69998a -s ours am:
0f30aa9801 am:
05ebddebe5 -s ours am:
101c043b17 am:
58086ff4aa am:
fec9d76740 am:
ea0d4b0e54 -s ours am:
45deda3682 am:
235702c0e0
am:
6063089d07
Change-Id: Ide2b5e8584c58e17b9026a9ab5fbb6d3dc2d7e62
Adam Seaton [Mon, 13 Feb 2017 23:38:42 +0000 (23:38 +0000)]
[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am:
502366cdc4 am:
3ce29b8a94 am:
b0cef41b76 -s ours am:
8f86884a97 -s ours am:
c901cec8b2 am:
a150db6547 -s ours am:
28ecd6fdd5 am:
58300f46bf am:
764c206e6d
am:
533ca31c93 -s ours
Change-Id: Ieb70f91622319054da2c811e2d0abecd4125ed9d
Adam Seaton [Mon, 13 Feb 2017 23:38:38 +0000 (23:38 +0000)]
[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am:
00c627eb31 am:
5be6d3bbb4 am:
ed38784898 -s ours am:
84702d9919 -s ours am:
d466175346 am:
bc19d8140c -s ours am:
53a64664c9 am:
caff84dcbe am:
2f222829e0
am:
69586d29d7 -s ours
Change-Id: I170ef47942f401b2157fac0e5b64b62248af51f7
OSDN Git Service
