Ying Wang
4c057c9ab4
am be09a520
: am 71958cca
: Merge "Establish explicit dependency on selinux file_contexts."
...
* commit 'be09a520c52b86e7ca473c3fefa8dd0cb6ca48be':
Establish explicit dependency on selinux file_contexts.
2012-11-21 12:24:19 -08:00
Ying Wang
be09a520c5
am 71958cca
: Merge "Establish explicit dependency on selinux file_contexts."
...
* commit '71958cca5d5d5b569a2bb2ad2a4baf53045334e9':
Establish explicit dependency on selinux file_contexts.
2012-11-21 12:22:23 -08:00
Ying Wang
71958cca5d
Merge "Establish explicit dependency on selinux file_contexts."
2012-11-21 11:10:32 -08:00
Ying Wang
9362c7ffdd
Establish explicit dependency on selinux file_contexts.
...
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory
Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
2012-11-21 11:09:45 -08:00
Ying Wang
fdbd9cbe2e
Establish explicit dependency on selinux file_contexts.
...
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory
Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
2012-11-21 10:47:00 -08:00
The Android Automerger
2b63490401
JDP50B
2012-11-19 16:50:51 -08:00
The Android Automerger
c5a153925f
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-19 16:50:33 -08:00
The Android Automerger
8035374142
JDP50
2012-11-19 16:13:54 -08:00
The Android Automerger
09446191ed
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-19 16:12:53 -08:00
Ed Heyl
d4382dd07e
bump version to 4.2.1
...
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 16:04:18 -08:00
The Android Automerger
476750c763
JOP40D
2012-11-19 16:03:54 -08:00
The Android Automerger
5a149026e6
JDP47D
2012-11-19 15:44:50 -08:00
Jean-Baptiste Queru
e532de9068
am 13638354
: (-s ours) Merge f7306051c1
...
* commit '136383549fb554d91938ddf352cc713abfac9d73':
bump version to 4.2.1
2012-11-19 15:13:50 -08:00
Jean-Baptiste Queru
136383549f
Merge f7306051c1
...
Change-Id: I6a431153832ea069aba269d09ec73b784844ff44
2012-11-19 15:08:59 -08:00
Ed Heyl
f7306051c1
am 0ddeb0cc
: am efcc8b1c
: bump version to 4.2.1
...
* commit '0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
bump version to 4.2.1
2012-11-19 14:29:37 -08:00
Ed Heyl
0ddeb0ccc1
am efcc8b1c
: bump version to 4.2.1
...
* commit 'efcc8b1c79011a6d8ea13774da84c8892cb27e27':
bump version to 4.2.1
2012-11-19 14:26:49 -08:00
Ed Heyl
efcc8b1c79
bump version to 4.2.1
...
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 14:20:48 -08:00
Ying Wang
422cd68c2d
Merge "Skip userdata.img if no size is provided when building images from target files"
2012-11-19 11:07:52 -08:00
Jean-Baptiste Queru
99dc93648f
am 9d9def1b
: (-s ours) resolved conflicts for merge of 4749c6e3
to jb-mr1-dev-plus-aosp - do not merge
...
* commit '9d9def1b182247d55e69eff1fe0ec1adfb0a5e01':
build_id: change to OPENMASTER
2012-11-19 10:59:48 -08:00
Jean-Baptiste Queru
9d9def1b18
resolved conflicts for merge of 4749c6e3
to jb-mr1-dev-plus-aosp - do not merge
...
Change-Id: I51fcb88d6b9f188a9c596031a2506eedc7150173
2012-11-19 10:57:48 -08:00
Ying Wang
4e3f44f356
Skip userdata.img if no size is provided when building images from target files
...
Change-Id: Iab5c510fcc7608c4b109781e6595ab8964f4c543
2012-11-19 10:38:44 -08:00
Jean-Baptiste Queru
4749c6e3e2
Merge "build_id: change to OPENMASTER"
2012-11-19 09:23:42 -08:00
Chirayu Desai
6d492971dd
build_id: change to OPENMASTER
...
Change-Id: I87863d8064515a0fabadacf4ca692c775fc4aae0
2012-11-18 14:09:34 +05:30
The Android Automerger
cd540e9a59
JDP47C
2012-11-16 17:23:04 -08:00
The Android Automerger
9f8ccf3e95
JDP47B
2012-11-16 17:01:05 -08:00
Ben Cheng
2a43d74fb4
am bf031a25
: am 17c679d0
: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*."
...
* commit 'bf031a2586daccf2a47a66c7cc80ac050ba1c16a':
[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
2012-11-16 16:25:51 -08:00
Ben Cheng
bf031a2586
am 17c679d0
: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*."
...
* commit '17c679d07380b0a4045045fd5d8e56111edf3fbd':
[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
2012-11-16 16:23:02 -08:00
Ben Cheng
17c679d073
Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*."
2012-11-16 15:48:44 -08:00
Ben Cheng
8bc4c438bd
[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
...
In the future to upgrade the gcc version we just need to edit one
line in core/config.mk.
Change-Id: I01bb38c38f2388913bb7369aa4b2da480411dfbe
2012-11-16 13:29:13 -08:00
Scott Main
c7d97577cb
am 691369bd
: am 287d1e42
: am 6a040270
: am 34a4b823
: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
...
* commit '691369bd6e8e5fd78d44e5f5ed33e1bbea24300d':
docs: revise message when api level for docs is too low; make the message appear on package pages as well
2012-11-16 11:37:35 -08:00
The Android Automerger
30c4cabb3a
JDP47
2012-11-16 11:32:14 -08:00
Scott Main
691369bd6e
am 287d1e42
: am 6a040270
: am 34a4b823
: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
...
* commit '287d1e42b48d74d3cba1d362d6379cd5ddcd0de4':
docs: revise message when api level for docs is too low; make the message appear on package pages as well
2012-11-16 10:52:05 -08:00
Scott Main
287d1e42b4
am 6a040270
: am 34a4b823
: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
...
* commit '6a0402701ee9672ef57f3049c3e6d7f5c01095b6':
docs: revise message when api level for docs is too low; make the message appear on package pages as well
2012-11-16 10:48:50 -08:00
Scott Main
6a0402701e
am 34a4b823
: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
...
* commit '34a4b8239e25103eb796dabd046d821942706b9f':
docs: revise message when api level for docs is too low; make the message appear on package pages as well
2012-11-16 10:45:44 -08:00
Scott Main
34a4b8239e
Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
2012-11-16 10:43:23 -08:00
Guang Zhu
1ebaf193dd
am fdf573e4
: (-s ours) am 06b57cef
: am f0d4d8f3
: DO NOT MERGE: change build id to JB MR1.1
...
* commit 'fdf573e4e0f5bf509c36f0153116f8e0f6e30183':
DO NOT MERGE: change build id to JB MR1.1
2012-11-16 10:43:10 -08:00
Scott Main
88181cf628
am 932682e6
: am 9ade5e79
: am 1f0850ee
: am 11ac05bb
: docs: add script for 32/64-bit bundle downloads
...
* commit '932682e61981cc7c91dc9d5bc291c6d98cd83c28':
docs: add script for 32/64-bit bundle downloads
2012-11-16 10:42:43 -08:00
Ying Wang
90304a74a3
am ae56a570
: am e1f94189
: am ce811261
: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
...
* commit 'ae56a570cb7e16a0853433d20691b0ee72da5cc2':
Move check-api to definition.mk
2012-11-16 10:42:41 -08:00
Scott Main
8f24ca8e3b
docs: revise message when api level for docs is too low;
...
make the message appear on package pages as well
Change-Id: I9e71d4054e2e14efe9646029ac0a18022ec24fb2
2012-11-16 10:34:22 -08:00
Scott Main
508d4a42e0
am 234fa617
: am aa09fda2
: am 2dc85a0f
: am 83cd28b3
: am 9efb6b09
: am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit '234fa6175ce16bc64dca65e52ebbfe6465b8d75a':
add script to generate list of classes for each training course landing page
2012-11-16 09:35:57 -08:00
Marco Nelissen
3f25d2232f
Merge "Add gsm codec to the build"
2012-11-16 09:20:37 -08:00
Guang Zhu
fdf573e4e0
am 06b57cef
: am f0d4d8f3
: DO NOT MERGE: change build id to JB MR1.1
...
* commit '06b57cefeaadd0e2f02a5c8a8679884366f4345e':
DO NOT MERGE: change build id to JB MR1.1
2012-11-15 18:00:23 -08:00
Guang Zhu
06b57cefea
am f0d4d8f3
: DO NOT MERGE: change build id to JB MR1.1
...
* commit 'f0d4d8f32934df6dc859e2b668d436d67b388cd2':
DO NOT MERGE: change build id to JB MR1.1
2012-11-15 17:57:58 -08:00
Guang Zhu
f0d4d8f329
DO NOT MERGE: change build id to JB MR1.1
...
Among other things, this helps monitoring of automated tests, to
properly show which branch the device is running on
Change-Id: I8bb8e3ec347849da44d29ce502b09a593d61ae0e
2012-11-15 17:47:53 -08:00
Marco Nelissen
8af41153d7
Add gsm codec to the build
...
b/6620569
Change-Id: Ieb113ecc9d1195360335c29fc9d1256205cd2516
2012-11-15 16:22:39 -08:00
Scott Main
932682e619
am 9ade5e79
: am 1f0850ee
: am 11ac05bb
: docs: add script for 32/64-bit bundle downloads
...
* commit '9ade5e79870f077d1b99a03cddde1adecfa3236c':
docs: add script for 32/64-bit bundle downloads
2012-11-15 15:26:16 -08:00
Ying Wang
ae56a570cb
am e1f94189
: am ce811261
: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
...
* commit 'e1f94189d95084a72d206d89ecb9d38de0512fc6':
Move check-api to definition.mk
2012-11-15 15:23:44 -08:00
Scott Main
9ade5e7987
am 1f0850ee
: am 11ac05bb
: docs: add script for 32/64-bit bundle downloads
...
* commit '1f0850ee04dcb54e0969f40f692ae00f1da5843b':
docs: add script for 32/64-bit bundle downloads
2012-11-15 15:23:43 -08:00
Scott Main
1f0850ee04
am 11ac05bb
: docs: add script for 32/64-bit bundle downloads
...
* commit '11ac05bb015c4097f828b0907a0835f7d546738c':
docs: add script for 32/64-bit bundle downloads
2012-11-15 15:21:00 -08:00
Ying Wang
e1f94189d9
am ce811261
: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
...
* commit 'ce811261bc8d56d43e59b1f9fb96ae53192de126':
Move check-api to definition.mk
2012-11-15 15:20:58 -08:00