OSDN Git Service
Chih-Wei Huang [Mon, 11 Jul 2016 04:08:58 +0000 (12:08 +0800)]
Build 64-bit kernel with gcc 4.6
Chih-Wei Huang [Thu, 13 Jan 2011 03:36:28 +0000 (11:36 +0800)]
add android-x86 keys
Chih-Wei Huang [Tue, 10 Jan 2017 04:38:36 +0000 (12:38 +0800)]
Merge tag 'android-6.0.1_r74' into marshmallow-x86
Android 6.0.1 release 74
gitbuildkicker [Tue, 11 Oct 2016 23:23:06 +0000 (16:23 -0700)]
MOB31K
gitbuildkicker [Fri, 30 Sep 2016 19:03:14 +0000 (12:03 -0700)]
MOB31J
gitbuildkicker [Tue, 27 Sep 2016 23:08:52 +0000 (16:08 -0700)]
MOB31I
Adam Seaton [Tue, 20 Sep 2016 17:06:50 +0000 (10:06 -0700)]
Updating Security String to 2016-11-05 on mnc-dev
b/
31618336
Change-Id: I3c9459553fdc89cacdf74d5e5801871b7192bc51
(cherry picked from commit
dcfd738833ea0c6d271b45d50a652191e6c345f0)
Adam Seaton [Tue, 20 Sep 2016 17:03:47 +0000 (10:03 -0700)]
Updating Security String to 2016-11-01 on mnc-dev
b/
31618336
Change-Id: I18b3a0d690ab238fcd3cafa65b873ce7432c9c25
(cherry picked from commit
62b28398ba157b65a4825bea59806c060503500c)
Chih-Wei Huang [Wed, 7 Sep 2016 16:30:11 +0000 (00:30 +0800)]
kernel.mk: refine extra modules building rules
Chih-Wei Huang [Wed, 7 Sep 2016 05:41:48 +0000 (13:41 +0800)]
Merge tag 'android-6.0.1_r66' into marshmallow-x86
Android 6.0.1 release 66
gitbuildkicker [Wed, 31 Aug 2016 01:05:24 +0000 (18:05 -0700)]
MOB31H
gitbuildkicker [Fri, 26 Aug 2016 23:16:38 +0000 (16:16 -0700)]
MOB31G
gitbuildkicker [Fri, 26 Aug 2016 04:56:35 +0000 (21:56 -0700)]
MOB31F
Adam Seaton [Thu, 25 Aug 2016 22:24:56 +0000 (15:24 -0700)]
Update comments around PLATFORM_SECURITY_LEVEL
Bug:
29881091
Change-Id: Ib30aac55540513e43af147914f4470a78f368ef6
(cherry picked from commit
f45494279a4f46c51ce26935e221a121262f49ee)
Adam Seaton [Thu, 18 Aug 2016 21:11:04 +0000 (14:11 -0700)]
Update Security String to 2016-10-05 to Platform and CTS for October
Security Updates (rebased)
b/
30946906
Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d
(cherry picked from commit
bb45bd20e97be07ec92facf411aae91d90490a5b)
Adam Seaton [Thu, 18 Aug 2016 17:33:30 +0000 (10:33 -0700)]
Update Security String to 2016-10-01 to platform and CTS for October Security
Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684
(cherry picked from commit
cb60b2dedbf6a346f3affc66a2e89a8068c530e2)
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 21:30:17 +0000 (23:30 +0200)]
Move BOARD_SYSTEMIMAGE_PARTITION_SIZE check to the correct target
This fixes
7e49f23
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.
gitbuildkicker [Fri, 12 Aug 2016 01:21:51 +0000 (18:21 -0700)]
"MOB31E"
Adam Seaton [Thu, 11 Aug 2016 19:39:25 +0000 (12:39 -0700)]
Update Security String to 2016-09-06 to platform and CTS for September
Security (+Quadrooter,-PZ)
Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a
gitbuildkicker [Tue, 9 Aug 2016 23:48:27 +0000 (16:48 -0700)]
"MOB31D"
Adam Seaton [Mon, 8 Aug 2016 22:08:45 +0000 (15:08 -0700)]
Update Security String to 2016-09-07 to platform and CTS for September
respin
Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b
Chih-Wei Huang [Wed, 3 Aug 2016 07:11:43 +0000 (15:11 +0800)]
Merge tag 'android-6.0.1_r61' into marshmallow-x86
Android 6.0.1 Release 61 (MOB30Z)
gitbuildkicker [Mon, 1 Aug 2016 21:25:25 +0000 (14:25 -0700)]
"MOB31C"
Adam Seaton [Thu, 28 Jul 2016 21:16:34 +0000 (14:16 -0700)]
Updating security string to 2016-09-05 to platform and CTS in preparation
for 2016 September OTA on mnc-dev
b/
30224278
Change-Id: I0f0591b7f0f033320de422c4019e056231228539
gitbuildkicker [Fri, 22 Jul 2016 00:36:48 +0000 (17:36 -0700)]
"MOB31B"
Zach Jang [Tue, 19 Jul 2016 20:20:45 +0000 (13:20 -0700)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
b/
30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
gitbuildkicker [Thu, 21 Jul 2016 21:26:13 +0000 (14:26 -0700)]
"MOB30Z"
gitbuildkicker [Fri, 15 Jul 2016 23:40:08 +0000 (16:40 -0700)]
"MOB30Y"
Chih-Wei Huang [Fri, 8 Jul 2016 10:38:23 +0000 (18:38 +0800)]
Merge tag 'android-6.0.1_r52' into marshmallow-x86
Android 6.0.1 Release 52 (MOB30R)
The Android Automerger [Wed, 6 Jul 2016 20:37:33 +0000 (13:37 -0700)]
"MOB30X"
The Android Automerger [Fri, 1 Jul 2016 20:59:24 +0000 (13:59 -0700)]
"MOB30W"
The Android Automerger [Thu, 30 Jun 2016 21:06:07 +0000 (14:06 -0700)]
"MOB30V"
The Android Automerger [Fri, 24 Jun 2016 23:59:10 +0000 (16:59 -0700)]
MOB30U
The Android Automerger [Fri, 24 Jun 2016 01:09:11 +0000 (18:09 -0700)]
"MOB30T"
The Android Automerger [Thu, 23 Jun 2016 22:08:50 +0000 (15:08 -0700)]
"MOB30S"
Daniel Micay [Tue, 17 May 2016 04:40:52 +0000 (00:40 -0400)]
disable unpriv perf by default in user{,debug} builds
(Cherry picked from commit
f2ac912b19ccbcc15d5176ec52c99744810adce7)
Bug:
29054680
Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
Kuan-Tung Pan [Thu, 23 Jun 2016 21:26:46 +0000 (21:26 +0000)]
Merge "Updating security string to 2016-08-05 - directly to mnc-mr2-release" into mnc-mr2-release
The Android Automerger [Thu, 23 Jun 2016 17:45:10 +0000 (10:45 -0700)]
"MOB30R"
Zach Jang [Wed, 22 Jun 2016 21:04:26 +0000 (14:04 -0700)]
Updating security string to 2016-08-05
- directly to mnc-mr2-release
b/
29513589
Change-Id: I10fbee9cda55e28e7d7b6b5f7889a1935a885470
The Android Automerger [Tue, 14 Jun 2016 23:54:18 +0000 (16:54 -0700)]
MOB30Q
The Android Automerger [Thu, 9 Jun 2016 20:29:54 +0000 (13:29 -0700)]
"MOB30P"
Chih-Wei Huang [Tue, 7 Jun 2016 00:29:25 +0000 (08:29 +0800)]
Merge tag 'android-6.0.1_r46' into marshmallow-x86
Android 6.0.1 release 46
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
The Android Automerger [Fri, 27 May 2016 18:34:22 +0000 (11:34 -0700)]
"MOB30O"
Zach Jang [Thu, 26 May 2016 23:00:38 +0000 (16:00 -0700)]
Updating security string to 2016-07-05 to release branches
b/
28912173
Change-Id: I60b28f3859f7ee006841ed4308e15404590b60bf
The Android Automerger [Thu, 26 May 2016 20:53:24 +0000 (13:53 -0700)]
"MOB30N"
The Android Automerger [Thu, 12 May 2016 20:52:10 +0000 (13:52 -0700)]
MOB30M
Alistair Strachan [Thu, 5 May 2016 23:29:08 +0000 (16:29 -0700)]
Avoid accidentally using the host's native 'as' command.
When invoking clang for the host to assemble .S files, the -B flag
would not be provided, which allowed the host prebuilt clang to
use an 'as' from the native environment. Most of the time this
"just works", but some newer 'as' versions cause problems with
the older prebuilt toolchain, for example by generating
unsupported relocation types.
To avoid this problem, simply use the -B flag to tell clang to
invoke the assembler from the correct prebuilt gcc prefix.
Change-Id: I18ea4f37ae637b652cfd7321c41929f8be075342
Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
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
Mauro Rossi [Mon, 23 Nov 2015 02:36:35 +0000 (03:36 +0100)]
kernel.mk: use updated broadcom-sta hybrid driver
Changes to support latest broadcom wl driver ver 6.30.223.271.
Complementary patch on kernel is needed to coherently update
drivers/net/wireless/wl patch files (wl.patch and linux-recent.patch)
Chih-Wei Huang [Thu, 15 Oct 2015 17:43:17 +0000 (01:43 +0800)]
android-x86: add kernel building rules
Ying Wang [Wed, 14 Oct 2015 01:00:45 +0000 (18:00 -0700)]
Allow to build against Mac OS X SDK 10.11.
Bug:
24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f
Chih-Wei Huang [Thu, 8 Oct 2015 07:07:23 +0000 (15:07 +0800)]
Remove duplicate local_time.default
Seems it's copied from target/product/generic_no_telephony.mk
which had duplicate local_time.default before.
(fixed in commit
567ea28838678f1cea789538dbf79cd94db1f2d9)
Change-Id: I09dcdffc14de08b3d25a5fd08364d38b2712bb08
Chih-Wei Huang [Sun, 4 Oct 2015 16:28:47 +0000 (00:28 +0800)]
Let get-prebuilt-src-arch return empty if the input is empty
The list of archs of a pure java apk (no native libs) is empty.
In this case get-prebuilt-src-arch still return 'none'.
If it's set to LOCAL_MODULE_TARGET_ARCH, it makes the apk
be incompatible with the building target. It's not good.
Just return empty in this case.
Change-Id: Ide75cdb08c8480c8e7d3a0ac59f41831fbc18bd5
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 [Mon, 19 Nov 2012 17:25:39 +0000 (01:25 +0800)]
android-x86: Use COPYING from our kernel tree
Chih-Wei Huang [Wed, 16 Mar 2011 02:37:30 +0000 (10:37 +0800)]
android-x86: add rules to generate system.sfs
The Android Automerger [Wed, 4 May 2016 18:53:00 +0000 (11:53 -0700)]
"MOB30L"
The Android Automerger [Fri, 22 Apr 2016 02:11:37 +0000 (19:11 -0700)]
"MOB30K"
Zach Jang [Tue, 19 Apr 2016 17:56:31 +0000 (10:56 -0700)]
Update security patch string to 2016-06-01
b/
28269112
Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
The Android Automerger [Mon, 18 Apr 2016 21:33:07 +0000 (14:33 -0700)]
"MOB30J"
The Android Automerger [Tue, 12 Apr 2016 00:36:00 +0000 (17:36 -0700)]
"MOB30I"
The Android Automerger [Fri, 8 Apr 2016 17:35:01 +0000 (10:35 -0700)]
"MOB30H"
The Android Automerger [Tue, 29 Mar 2016 22:59:28 +0000 (15:59 -0700)]
"MOB30G"
The Android Automerger [Tue, 29 Mar 2016 01:12:02 +0000 (18:12 -0700)]
"MOB30F"
The Android Automerger [Sat, 26 Mar 2016 00:48:21 +0000 (17:48 -0700)]
"MOB30E"
Zach Jang [Tue, 22 Mar 2016 00:42:55 +0000 (17:42 -0700)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
b/
27724973
Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
The Android Automerger [Tue, 22 Mar 2016 23:00:09 +0000 (16:00 -0700)]
MOB30D
Zach Jang [Fri, 18 Mar 2016 00:11:47 +0000 (17:11 -0700)]
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
- kernel updates with patches for CVE-2015-1805
b/
27724967
Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f
Fix merge conflict to mnc-mr2-release w/ security string change to 2016-04-02
The Android Automerger [Thu, 17 Mar 2016 02:47:23 +0000 (19:47 -0700)]
MOB30C
The Android Automerger [Wed, 2 Mar 2016 03:15:31 +0000 (19:15 -0800)]
MOB30B
The Android Automerger [Sat, 27 Feb 2016 00:56:25 +0000 (16:56 -0800)]
"MOB29Z"
Zach Jang [Fri, 19 Feb 2016 21:50:29 +0000 (13:50 -0800)]
Updating security string patch to 2016-04-01
b/
27272697
Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
The Android Automerger [Thu, 25 Feb 2016 03:56:31 +0000 (19:56 -0800)]
MOB29Y
The Android Automerger [Wed, 24 Feb 2016 21:21:39 +0000 (13:21 -0800)]
"MOB29X"
The Android Automerger [Tue, 16 Feb 2016 20:28:52 +0000 (12:28 -0800)]
"MOB29W"
The Android Automerger [Fri, 22 Jan 2016 21:43:14 +0000 (13:43 -0800)]
"MMB29V"
Zach Jang [Tue, 12 Jan 2016 01:12:37 +0000 (17:12 -0800)]
Updating security patch string to 2016-03-01
b/
26499556
Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
The Android Automerger [Thu, 17 Dec 2015 21:15:30 +0000 (13:15 -0800)]
"MMB29U"
The Android Automerger [Thu, 17 Dec 2015 21:08:32 +0000 (13:08 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Wed, 16 Dec 2015 20:07:39 +0000 (12:07 -0800)]
"MMB29T"
The Android Automerger [Tue, 15 Dec 2015 21:31:36 +0000 (13:31 -0800)]
"MMB29S"
The Android Automerger [Tue, 15 Dec 2015 21:24:12 +0000 (13:24 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Tue, 15 Dec 2015 20:55:01 +0000 (12:55 -0800)]
"MMB76"
The Android Automerger [Tue, 15 Dec 2015 20:54:55 +0000 (12:54 -0800)]
merge in mnc-mr1-release history after reset to mnc-dr-dev
The Android Automerger [Fri, 11 Dec 2015 18:27:49 +0000 (10:27 -0800)]
"MMB29R"
The Android Automerger [Fri, 11 Dec 2015 00:11:59 +0000 (16:11 -0800)]
"MMB29Q"
Zach Jang [Wed, 9 Dec 2015 20:46:59 +0000 (12:46 -0800)]
Update Security String to 2016-02-01
b/
26110717
Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
The Android Automerger [Tue, 8 Dec 2015 20:35:29 +0000 (12:35 -0800)]
MMN29P
The Android Automerger [Wed, 2 Dec 2015 01:42:01 +0000 (17:42 -0800)]
"MMB29O"
Zach Jang [Fri, 20 Nov 2015 22:37:14 +0000 (14:37 -0800)]
Update Security String to 2016-01-01 to mnc-dev
http://b/
25819582
Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
Bart Sears [Sun, 15 Nov 2015 17:57:13 +0000 (17:57 +0000)]
Revert "Change version back to 6.0"
This reverts commit
970f203b3d3f17b778749c3ce47eb6b922aa606c.
Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
Bart Sears [Sun, 15 Nov 2015 07:50:18 +0000 (23:50 -0800)]
Change version back to 6.0
Temporarily set the version back to 6.0 and security patch to
2015-11-01.
Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
The Android Automerger [Thu, 19 Nov 2015 00:31:30 +0000 (16:31 -0800)]
MMB29N
The Android Automerger [Tue, 17 Nov 2015 18:58:18 +0000 (10:58 -0800)]
"MMB29M"