Ying Wang
7d883401c0
Merge "Added variables to support seperate vendor patition."
2014-06-10 22:18:15 +00:00
Doug Zongker
a5eac7cadb
Merge "configure progress bar during block OTA script generation"
2014-06-10 21:13:43 +00:00
Bart Sears
b602f7b147
am 5c2225c5
: am 7976b2be
: resolved conflicts for merge of 0e23c5e3
to klp-modular-dev
...
* commit '5c2225c592da49855dbc665edb9f03c18deddb78':
MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
2014-06-10 18:41:52 +00:00
Vineeta Srivastava
19f6933724
Merge "Add synaptics to vendor owner whitelist"
2014-06-09 23:27:11 +00:00
Doug Zongker
4b9596fe00
configure progress bar during block OTA script generation
...
Emit script commands to produce a more accurate progress bar (for full
block OTAs) and a working progress bar (for incremental block OTAs) --
ones that are driven by the progress callback from the thing actually
writing the system image.
Change-Id: Ifca10be68cfdaab7135d23515bd0ae5be2f98a16
2014-06-09 14:15:45 -07:00
Bart Sears
5c2225c592
am 7976b2be
: resolved conflicts for merge of 0e23c5e3
to klp-modular-dev
...
* commit '7976b2be9e41dbf789ad31b331e355a0a949d00a':
MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
2014-06-09 21:12:45 +00:00
Erik Pasternak
30e677081b
am e1d76eed
: Merge "Revert "Integrate build_font.py"" into lmp-preview-dev
...
* commit 'e1d76eed322e620213cd4f936a29229a7658c6a1':
Revert "Integrate build_font.py"
2014-06-09 15:55:48 +00:00
Deepanshu Gupta
12d786b56d
am 8723f9e2
: Merge "Integrate build_font.py" into lmp-preview-dev
...
* commit '8723f9e2127204e19b00b0c19d091bee7e3e1b0c':
Integrate build_font.py
2014-06-09 15:55:29 +00:00
Erik Pasternak
e1d76eed32
Merge "Revert "Integrate build_font.py"" into lmp-preview-dev
2014-06-08 20:12:41 +00:00
Erik Pasternak
21cf439581
Revert "Integrate build_font.py"
...
This CL broke the SDK builds.
This reverts commit 9eebd78f6e
.
Change-Id: I973b40688602461bd3b0f8c1e1beb53b9fbec83c
2014-06-08 19:31:01 +00:00
Deepanshu Gupta
8723f9e212
Merge "Integrate build_font.py" into lmp-preview-dev
2014-06-07 23:33:12 +00:00
Lajos Molnar
f1831cb022
am 93d45370
: core_base.mk: add hevc software decoder
...
* commit '93d45370bea37e2c1e5931181fef12c67e9d2f98':
core_base.mk: add hevc software decoder
2014-06-06 23:03:31 +00:00
Stephen Hines
d17e71f185
am 69d5bd7c
: am e266873b
: am 1a8f0d3b
: Merge "Move comment out of recipe section"
...
* commit '69d5bd7cbc873c86685c463ac3dc7ab8de9e71e7':
Move comment out of recipe section
2014-06-06 21:33:48 +00:00
Stephen Hines
69d5bd7cbc
am e266873b
: am 1a8f0d3b
: Merge "Move comment out of recipe section"
...
* commit 'e266873b211289ce07420ec2c51208ff83c49c36':
Move comment out of recipe section
2014-06-06 21:30:57 +00:00
Bart Sears
7976b2be9e
resolved conflicts for merge of 0e23c5e3
to klp-modular-dev
...
Resolve merge conflict from changing PLATFORM_VERSION from
4.4.3 to 4.4.4 in klp-dev. Resolved the conflict by skipping
the merge since we want to leave klp-modular-dev as 4.4W.
2014-06-06 14:21:28 -07:00
Stephen Hines
e266873b21
am 1a8f0d3b
: Merge "Move comment out of recipe section"
...
* commit '1a8f0d3b6dc316034e1e3b28702fead4108ec8d3':
Move comment out of recipe section
2014-06-06 21:17:40 +00:00
Bart Sears
0e23c5e305
am 3b118a55
: MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
...
* commit '3b118a55b94d96f8ac1e1f903d17ed650ccd0355':
MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
2014-06-06 21:07:46 +00:00
Stephen Hines
1a8f0d3b6d
Merge "Move comment out of recipe section"
2014-06-06 21:07:25 +00:00
Bart Sears
3b118a55b9
MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE
...
Make is so.
Change-Id: I06b8c8c491e6e355124b6fea41893155ea4c07d0
2014-06-06 20:41:08 +00:00
Stephen Hines
8ff9252680
Move comment out of recipe section
...
If we keep a comment in the recipe, it prints out whenever that component
gets built.
Change-Id: Idb99a9edc02cfb87e35e59b7fd37588b928b98a5
2014-06-06 12:51:47 -07:00
Ying Wang
dd4db3058a
am 56ec31cf
: am 3fe9a277
: am d0f0918b
: Merge "Reenable ccache."
...
* commit '56ec31cfca1ed5f9d833d73c327b2799601cd5a4':
Reenable ccache.
2014-06-06 18:43:44 +00:00
Ying Wang
56ec31cfca
am 3fe9a277
: am d0f0918b
: Merge "Reenable ccache."
...
* commit '3fe9a277fe1f21b947bb7ac5d093d969eb10dc6b':
Reenable ccache.
2014-06-06 18:40:14 +00:00
Ying Wang
3fe9a277fe
am d0f0918b
: Merge "Reenable ccache."
...
* commit 'd0f0918b8fa2a1794050a3cecf3ad3943ad378ab':
Reenable ccache.
2014-06-06 18:24:31 +00:00
Ying Wang
d0f0918b8f
Merge "Reenable ccache."
2014-06-06 18:21:09 +00:00
Ying Wang
67ed25f3a6
Reenable ccache.
...
The previous commit 994c84fb
virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.
Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
2014-06-06 11:18:04 -07:00
Lajos Molnar
93d45370be
core_base.mk: add hevc software decoder
...
Bug: 14571712
Change-Id: I41c57023c6bcba73859b61052cacfd4ffd02e3dd
2014-06-05 22:29:49 -07:00
Adam Lesinski
c1dd8b4e67
Merge commit '2f9a705e' into manualmerge
...
Conflicts:
target/product/core_tiny.mk
Change-Id: I6d2f57be8d4e65768d51f6db65d78295d1d3e3fa
2014-06-05 15:27:26 -07:00
Vineeta Srivastava
5c80218b8e
Add synaptics to vendor owner whitelist
...
Change-Id: Idef39568cbcc53cb50badcc8d59b7770eef10d5e
2014-06-05 22:25:56 +00:00
Adam Lesinski
2f9a705e5e
am 3f1b5c52
: Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev
...
* commit '3f1b5c52d27165fc5aa0fbf443f10e8ad3e81ab7':
The public Telephony APIs must be present in all Android products
2014-06-05 22:21:32 +00:00
Adam Lesinski
3f1b5c52d2
Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev
2014-06-05 22:19:27 +00:00
Eric Laurent
e807ab0269
Merge "add sound trigger service library"
2014-06-05 15:33:10 +00:00
Eric Laurent
b0baa27f3d
add sound trigger service library
...
Change-Id: I444396c5a1df13ad59c2a236849e9c729faed956
2014-06-04 15:37:15 -07:00
Ying Wang
91ec480fe7
am 1cd740f1
: am 1343ec16
: am b75fe469
: am eafdd2cd
: Fix emulator builds
...
* commit '1cd740f1f07f3a1293c5034c97d977ba699b105a':
Fix emulator builds
2014-06-04 22:32:29 +00:00
Ying Wang
1cd740f1f0
am 1343ec16
: am b75fe469
: am eafdd2cd
: Fix emulator builds
...
* commit '1343ec169c1bbbf7c5f1d5d2ce6d30d27bbea992':
Fix emulator builds
2014-06-04 22:30:05 +00:00
Ying Wang
1343ec169c
am b75fe469
: am eafdd2cd
: Fix emulator builds
...
* commit 'b75fe4696e847ef49aa9b11693243c00de497808':
Fix emulator builds
2014-06-04 22:24:51 +00:00
Ying Wang
b75fe4696e
am eafdd2cd
: Fix emulator builds
...
* commit 'eafdd2cd878c8fd23033302a2c5010505412981f':
Fix emulator builds
2014-06-04 22:21:38 +00:00
Ying Wang
eafdd2cd87
Fix emulator builds
...
which don't have boot.img.
Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
2014-06-04 15:16:17 -07:00
Andrew Hsieh
feebda2f8e
am 51b6c144
: (-s ours) Merge "Add -latomic to all target builds" into lmp-preview-dev
...
* commit '51b6c144239583ea75b13103cfb4b3ac5fa00332':
Add -latomic to all target builds
2014-06-04 20:04:43 +00:00
Tim Murray
a526c48982
am 45c39300
: am 3c52ff07
: am e564c0cb
: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
...
* commit '45c3930084180857d7b09c0859805506e7ede847':
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
2014-06-04 19:22:56 +00:00
Tim Murray
45c3930084
am 3c52ff07
: am e564c0cb
: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
...
* commit '3c52ff07141c236b51a2ccfe5fdb3de33421bd3b':
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
2014-06-04 19:20:29 +00:00
Tim Murray
3c52ff0714
am e564c0cb
: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
...
* commit 'e564c0cbd08c728d84e62308c741b30f3bd542f8':
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
2014-06-04 19:05:45 +00:00
Tim Murray
e564c0cbd0
Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
2014-06-04 19:00:38 +00:00
Qiwen Zhao
19a7f86876
am c3136cd9
: (-s ours) am d6e6f97a
: (-s ours) am e8e7ebbd
: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
...
* commit 'c3136cd9988c9d1891751e9d64d714bb12c82d7f':
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
2014-06-04 18:55:21 +00:00
Qiwen Zhao
c3136cd998
am d6e6f97a
: (-s ours) am e8e7ebbd
: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
...
* commit 'd6e6f97a8e015f39e40e434d7a5ab0d1eadcd691':
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
2014-06-04 18:52:14 +00:00
Tim Murray
83d91e3409
am 2148abfd
: Merge "Add libsigchain to the embedded.mk makefile" into lmp-preview-dev
...
* commit '2148abfdb0386ac301ced5d9b24493b6d0f0e749':
Add libsigchain to the embedded.mk makefile
2014-06-04 18:43:28 +00:00
Ying Wang
3b7233b545
am e3e421f8
: Move sdk staging dir to a product-specific dir
...
* commit 'e3e421f85125c2c173bcafa07e901b6248e9530c':
Move sdk staging dir to a product-specific dir
2014-06-04 18:43:28 +00:00
Qiwen Zhao
d6e6f97a8e
am e8e7ebbd
: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
...
* commit 'e8e7ebbde46df2a4dafc4c90a53abd911d1255ec':
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
2014-06-04 18:27:18 +00:00
Qiwen Zhao
e8e7ebbde4
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
...
This reverts commit a5abefbbb5
.
2014-06-04 11:21:21 -07:00
Ying Wang
9e005d4767
am e8dc1868
: (-s ours) am dc7ff054
: am bc080d51
: am 2a386e0c
: Allow to build the update.zip for emulator build.
...
* commit 'e8dc18680f107ea3f5c6f9376f496063c292cd98':
Allow to build the update.zip for emulator build.
2014-06-04 17:42:18 +00:00
Ying Wang
3a9cb0ca11
Merge "Allow to build the update.zip for emulator build."
2014-06-04 17:40:45 +00:00