OSDN Git Service
Stephen Hines [Fri, 6 Jun 2014 21:33:48 +0000 (21:33 +0000)]
am
69d5bd7c: am
e266873b: am
1a8f0d3b: Merge "Move comment out of recipe section"
* commit '
69d5bd7cbc873c86685c463ac3dc7ab8de9e71e7':
Move comment out of recipe section
Stephen Hines [Fri, 6 Jun 2014 21:30:57 +0000 (21:30 +0000)]
am
e266873b: am
1a8f0d3b: Merge "Move comment out of recipe section"
* commit '
e266873b211289ce07420ec2c51208ff83c49c36':
Move comment out of recipe section
Stephen Hines [Fri, 6 Jun 2014 21:17:40 +0000 (21:17 +0000)]
am
1a8f0d3b: Merge "Move comment out of recipe section"
* commit '
1a8f0d3b6dc316034e1e3b28702fead4108ec8d3':
Move comment out of recipe section
Stephen Hines [Fri, 6 Jun 2014 21:07:24 +0000 (21:07 +0000)]
Merge "Move comment out of recipe section"
Stephen Hines [Fri, 6 Jun 2014 19:51:47 +0000 (12:51 -0700)]
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
Ying Wang [Fri, 6 Jun 2014 18:43:44 +0000 (18:43 +0000)]
am
56ec31cf: am
3fe9a277: am
d0f0918b: Merge "Reenable ccache."
* commit '
56ec31cfca1ed5f9d833d73c327b2799601cd5a4':
Reenable ccache.
Ying Wang [Fri, 6 Jun 2014 18:40:14 +0000 (18:40 +0000)]
am
3fe9a277: am
d0f0918b: Merge "Reenable ccache."
* commit '
3fe9a277fe1f21b947bb7ac5d093d969eb10dc6b':
Reenable ccache.
Ying Wang [Fri, 6 Jun 2014 18:24:31 +0000 (18:24 +0000)]
am
d0f0918b: Merge "Reenable ccache."
* commit '
d0f0918b8fa2a1794050a3cecf3ad3943ad378ab':
Reenable ccache.
Ying Wang [Fri, 6 Jun 2014 18:21:09 +0000 (18:21 +0000)]
Merge "Reenable ccache."
Ying Wang [Fri, 6 Jun 2014 18:17:34 +0000 (11:17 -0700)]
Reenable ccache.
The previous commit
994c84fb virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.
Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
Adam Lesinski [Thu, 5 Jun 2014 22:27:26 +0000 (15:27 -0700)]
Merge commit '
2f9a705e' into manualmerge
Conflicts:
target/product/core_tiny.mk
Change-Id: I6d2f57be8d4e65768d51f6db65d78295d1d3e3fa
Adam Lesinski [Thu, 5 Jun 2014 22:21:32 +0000 (22:21 +0000)]
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
Adam Lesinski [Thu, 5 Jun 2014 22:19:26 +0000 (22:19 +0000)]
Merge "The public Telephony APIs must be present in all Android products" into klp-modular-dev
Eric Laurent [Thu, 5 Jun 2014 15:33:09 +0000 (15:33 +0000)]
Merge "add sound trigger service library"
Eric Laurent [Sat, 19 Apr 2014 00:37:49 +0000 (17:37 -0700)]
add sound trigger service library
Change-Id: I444396c5a1df13ad59c2a236849e9c729faed956
Ying Wang [Wed, 4 Jun 2014 22:32:29 +0000 (22:32 +0000)]
am
1cd740f1: am
1343ec16: am
b75fe469: am
eafdd2cd: Fix emulator builds
* commit '
1cd740f1f07f3a1293c5034c97d977ba699b105a':
Fix emulator builds
Ying Wang [Wed, 4 Jun 2014 22:30:05 +0000 (22:30 +0000)]
am
1343ec16: am
b75fe469: am
eafdd2cd: Fix emulator builds
* commit '
1343ec169c1bbbf7c5f1d5d2ce6d30d27bbea992':
Fix emulator builds
Ying Wang [Wed, 4 Jun 2014 22:24:51 +0000 (22:24 +0000)]
am
b75fe469: am
eafdd2cd: Fix emulator builds
* commit '
b75fe4696e847ef49aa9b11693243c00de497808':
Fix emulator builds
Ying Wang [Wed, 4 Jun 2014 22:21:38 +0000 (22:21 +0000)]
am
eafdd2cd: Fix emulator builds
* commit '
eafdd2cd878c8fd23033302a2c5010505412981f':
Fix emulator builds
Ying Wang [Wed, 5 Feb 2014 19:28:51 +0000 (11:28 -0800)]
Fix emulator builds
which don't have boot.img.
Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
Andrew Hsieh [Wed, 4 Jun 2014 20:04:43 +0000 (20:04 +0000)]
am
51b6c144: (-s ours) Merge "Add -latomic to all target builds" into lmp-preview-dev
* commit '
51b6c144239583ea75b13103cfb4b3ac5fa00332':
Add -latomic to all target builds
Tim Murray [Wed, 4 Jun 2014 19:22:56 +0000 (19:22 +0000)]
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.
Tim Murray [Wed, 4 Jun 2014 19:20:29 +0000 (19:20 +0000)]
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.
Tim Murray [Wed, 4 Jun 2014 19:05:45 +0000 (19:05 +0000)]
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.
Tim Murray [Wed, 4 Jun 2014 19:00:38 +0000 (19:00 +0000)]
Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools."
Qiwen Zhao [Wed, 4 Jun 2014 18:55:21 +0000 (18:55 +0000)]
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""
Qiwen Zhao [Wed, 4 Jun 2014 18:52:14 +0000 (18:52 +0000)]
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""
Tim Murray [Wed, 4 Jun 2014 18:43:28 +0000 (18:43 +0000)]
am
2148abfd: Merge "Add libsigchain to the embedded.mk makefile" into lmp-preview-dev
* commit '
2148abfdb0386ac301ced5d9b24493b6d0f0e749':
Add libsigchain to the embedded.mk makefile
Ying Wang [Wed, 4 Jun 2014 18:43:28 +0000 (18:43 +0000)]
am
e3e421f8: Move sdk staging dir to a product-specific dir
* commit '
e3e421f85125c2c173bcafa07e901b6248e9530c':
Move sdk staging dir to a product-specific dir
Qiwen Zhao [Wed, 4 Jun 2014 18:27:18 +0000 (18:27 +0000)]
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""
Qiwen Zhao [Wed, 4 Jun 2014 18:21:21 +0000 (11:21 -0700)]
Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""
This reverts commit
a5abefbbb527490dd76e34780dc2bfc6ed6a437d.
Ying Wang [Wed, 4 Jun 2014 17:42:18 +0000 (17:42 +0000)]
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.
Ying Wang [Wed, 4 Jun 2014 17:40:45 +0000 (17:40 +0000)]
Merge "Allow to build the update.zip for emulator build."
Qiwen Zhao [Wed, 4 Jun 2014 17:36:33 +0000 (17:36 +0000)]
am
eed384a9: (-s ours) am
5de36c46: (-s ours) am
a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
eed384a9b869b9238dd480e048988b2b35c53a66':
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
Steve Moyer [Wed, 4 Jun 2014 17:36:32 +0000 (17:36 +0000)]
am
67d25adb: (-s ours) am
c653faa8: (-s ours) am
37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
67d25adb9fb8f744b9c03a999b9474774167402a':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Wed, 4 Jun 2014 17:36:31 +0000 (17:36 +0000)]
am
2664e5f0: (-s ours) am
1e1681db: (-s ours) am
008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
2664e5f02c79c18a1286fde0454f98361d08d42c':
DO NOT MERGE: Combine emulator test projects into a single apk
Ying Wang [Wed, 4 Jun 2014 17:30:32 +0000 (17:30 +0000)]
am
dc7ff054: am
bc080d51: am
2a386e0c: Allow to build the update.zip for emulator build.
* commit '
dc7ff05427e885a59e8884e0f8e10a6c78f2842b':
Allow to build the update.zip for emulator build.
Qiwen Zhao [Wed, 4 Jun 2014 17:29:03 +0000 (17:29 +0000)]
am
5de36c46: (-s ours) am
a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
5de36c46d84eeb944646fe5413502f8aabcc76c3':
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
Steve Moyer [Wed, 4 Jun 2014 17:28:52 +0000 (17:28 +0000)]
am
c653faa8: (-s ours) am
37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
c653faa88717b0ca5e97b39a4016399d7a67549f':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Wed, 4 Jun 2014 17:28:51 +0000 (17:28 +0000)]
am
1e1681db: (-s ours) am
008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
1e1681db51e87c08b88dd5ffd961eb815b5aeb86':
DO NOT MERGE: Combine emulator test projects into a single apk
Ying Wang [Wed, 4 Jun 2014 17:26:00 +0000 (17:26 +0000)]
am
bc080d51: am
2a386e0c: Allow to build the update.zip for emulator build.
* commit '
bc080d510f022da8055b89b85e02d91e74c3757d':
Allow to build the update.zip for emulator build.
Ying Wang [Wed, 4 Jun 2014 17:22:21 +0000 (17:22 +0000)]
am
2a386e0c: Allow to build the update.zip for emulator build.
* commit '
2a386e0cfbdfa009038acede85876a7643f297f5':
Allow to build the update.zip for emulator build.
Qiwen Zhao [Wed, 4 Jun 2014 17:12:13 +0000 (17:12 +0000)]
am
a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
a5abefbbb527490dd76e34780dc2bfc6ed6a437d':
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
Ying Wang [Tue, 3 Jun 2014 21:07:27 +0000 (14:07 -0700)]
Allow to build the update.zip for emulator build.
img_from_target_files.py just skips the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.
Bug:
15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
Qiwen Zhao [Wed, 4 Jun 2014 17:02:29 +0000 (10:02 -0700)]
Revert "DO NOT MERGE: Combine emulator test projects into a single apk"
This reverts commit
0ced06ea0f20cf8bd6a1a2b2e34531f04f621c00.
Steve Moyer [Wed, 4 Jun 2014 16:55:53 +0000 (16:55 +0000)]
am
37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
37773821f150778c48ef3519407d8ee71dd66a30':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Wed, 4 Jun 2014 16:55:52 +0000 (16:55 +0000)]
am
008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk
* commit '
008dc16cb06976620c0fa1e51942f2d1c6af54f3':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Neil Fuller [Wed, 4 Jun 2014 10:53:25 +0000 (10:53 +0000)]
Merge "Add the okhttp tests as a new CTS package"
Andrew Hsieh [Wed, 4 Jun 2014 07:38:24 +0000 (07:38 +0000)]
Merge "Add -latomic to all target builds" into lmp-preview-dev
Adam Lesinski [Wed, 4 Jun 2014 04:12:25 +0000 (21:12 -0700)]
The public Telephony APIs must be present in all Android products
Change-Id: I8d510a422b00b65beed2675c611301e20fd1356f
Stephen Hines [Wed, 4 Jun 2014 01:28:44 +0000 (18:28 -0700)]
Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
Change-Id: I7735fd88104ff95001dd5f88a1c387df9af993ad
Dirk Dougherty [Wed, 4 Jun 2014 00:12:00 +0000 (00:12 +0000)]
am
f092f7fd: am
cfdf93c0: am
201cdd30: am
600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '
f092f7fd2dc1a7b0cb602e69d78f492edacf541d':
css adjustments for headings with dynamic content
Dirk Dougherty [Wed, 4 Jun 2014 00:11:54 +0000 (00:11 +0000)]
am
41848612: am
e473e9bd: am
706bb0eb: am
44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '
4184861247d997858c0cc23aa5623698c649eeca':
Add universal analytics code.
Dirk Dougherty [Tue, 3 Jun 2014 23:18:12 +0000 (23:18 +0000)]
am
cfdf93c0: am
201cdd30: am
600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '
cfdf93c003a7afc18eb9a79921abf7b472e6d745':
css adjustments for headings with dynamic content
Dirk Dougherty [Tue, 3 Jun 2014 23:14:41 +0000 (23:14 +0000)]
am
201cdd30: am
600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '
201cdd30e07ecddb333b4e347fbf14493fd2643c':
css adjustments for headings with dynamic content
Dirk Dougherty [Tue, 3 Jun 2014 23:10:24 +0000 (23:10 +0000)]
am
600e588e: Merge "css adjustments for headings with dynamic content" into klp-docs
* commit '
600e588e9902c4bf3e0fd567a9338a5381249ba3':
css adjustments for headings with dynamic content
Dirk Dougherty [Tue, 3 Jun 2014 23:08:13 +0000 (23:08 +0000)]
Merge "css adjustments for headings with dynamic content" into klp-docs
Dirk Dougherty [Tue, 3 Jun 2014 23:03:22 +0000 (23:03 +0000)]
am
e473e9bd: am
706bb0eb: am
44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '
e473e9bdc95b7f962d30d577975411b106b0eafe':
Add universal analytics code.
Tim Murray [Tue, 3 Jun 2014 23:03:20 +0000 (23:03 +0000)]
Merge "Add libsigchain to the embedded.mk makefile" into lmp-preview-dev
Dirk Dougherty [Tue, 3 Jun 2014 23:01:49 +0000 (23:01 +0000)]
am
706bb0eb: am
44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '
706bb0eb6455a7775596a87c9d515113e227c571':
Add universal analytics code.
Dirk Dougherty [Tue, 3 Jun 2014 22:59:49 +0000 (22:59 +0000)]
am
44b740e7: Merge "Add universal analytics code." into klp-docs
* commit '
44b740e7e556f60b36a45a4a386157f55981df8e':
Add universal analytics code.
Dirk Dougherty [Tue, 3 Jun 2014 22:56:50 +0000 (22:56 +0000)]
Merge "Add universal analytics code." into klp-docs
Michael Runge [Tue, 3 Jun 2014 22:32:38 +0000 (22:32 +0000)]
Merge "Add sprout support to signing tools"
Michael Runge [Tue, 3 Jun 2014 21:43:11 +0000 (14:43 -0700)]
Add sprout support to signing tools
Bug:
15379701
Change-Id: Ied8329e1162250cc5509b65ef8bf0b5a9ddda3c3
Ying Wang [Tue, 3 Jun 2014 21:07:27 +0000 (14:07 -0700)]
Allow to build the update.zip for emulator build.
img_from_target_files.py just skipps the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.
Bug:
15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
Scott Main [Tue, 3 Jun 2014 18:14:09 +0000 (18:14 +0000)]
am
5ffee03c: am
88c6d8d3: am
8c02b1ac: am
7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '
5ffee03c8573ab404a7b466bf64a8254665d8efc':
fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
Scott Main [Tue, 3 Jun 2014 18:06:39 +0000 (18:06 +0000)]
am
88c6d8d3: am
8c02b1ac: am
7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '
88c6d8d33e8b5532e3b6c940cc044454fcea206a':
fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
Primiano Tucci [Tue, 3 Jun 2014 13:20:03 +0000 (13:20 +0000)]
am
b641702c: am
1d6506ca: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
* commit '
b641702c0807af43eae3357df0c84a9c9d4fd744':
Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
Primiano Tucci [Tue, 3 Jun 2014 13:13:43 +0000 (13:13 +0000)]
am
1d6506ca: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
* commit '
1d6506ca4bb62a8f66cf5f0a72bde096115e757a':
Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
Primiano Tucci [Mon, 2 Jun 2014 16:37:38 +0000 (17:37 +0100)]
Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)
(cherry-picked from AOSP
994c84fb40fd74199feb1229e40acb538993c0f2)
Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
Primiano Tucci [Tue, 3 Jun 2014 09:29:50 +0000 (09:29 +0000)]
Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."
Scott Main [Tue, 3 Jun 2014 02:15:56 +0000 (02:15 +0000)]
am
8c02b1ac: am
7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '
8c02b1ac514b5757aad7d2736ed97bcbff7c7d58':
fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
Scott Main [Tue, 3 Jun 2014 02:12:01 +0000 (02:12 +0000)]
am
7a7abbdb: Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
* commit '
7a7abbdb101cd1094e5c2a72a4733e4800824c76':
fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load.
Dirk Dougherty [Tue, 3 Jun 2014 02:02:18 +0000 (19:02 -0700)]
Add universal analytics code.
Change-Id: I3b565a1cd422c5cbd3da8560e533741b880615a7
Scott Main [Tue, 3 Jun 2014 02:06:33 +0000 (02:06 +0000)]
Merge "fix bug in chrome with anchors not scrolling into view on new pages. added a 100ms delay to the scroll offset because chrome does not immediately scroll the page to the anchor on page load." into klp-docs
Ying Wang [Mon, 2 Jun 2014 23:16:53 +0000 (16:16 -0700)]
Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.
(cherry picked from commit
d7af17619983c4cf679abb034469098235e63ad5)
Change-Id: I30ebed5328123629519a64c793f94fc8d5aa09a8
Ying Wang [Tue, 3 Jun 2014 01:27:55 +0000 (01:27 +0000)]
am
dfafee3b: am
7f349dc9: am
40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '
dfafee3b782cc48562126b9c4748cfa2f49f3158':
Move sdk staging dir to a product-specific dir
Ying Wang [Tue, 3 Jun 2014 01:25:23 +0000 (01:25 +0000)]
am
7f349dc9: am
40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '
7f349dc968a3fc76f48e1e199f1036b40e582851':
Move sdk staging dir to a product-specific dir
Ying Wang [Tue, 3 Jun 2014 01:22:51 +0000 (01:22 +0000)]
am
40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '
40b7e34240be756bbf1542b63eef6332024d067e':
Move sdk staging dir to a product-specific dir
Ying Wang [Tue, 3 Jun 2014 01:20:29 +0000 (01:20 +0000)]
Merge "Move sdk staging dir to a product-specific dir"
Ying Wang [Mon, 2 Jun 2014 23:16:53 +0000 (16:16 -0700)]
Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.
Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
Dave Allison [Fri, 16 May 2014 20:51:36 +0000 (13:51 -0700)]
Add libsigchain to the embedded.mk makefile
This library is used in a LD_PRELOAD environment variable and the linker shows
a warning if it is not present. This change is to added it to all targets so
that the warning is not shown. If ART is not provided on the device this
library has no effect.
Change-Id: I81f01b66fa9c78048534f4bcfc04d62b18057a03
Nick Kralevich [Mon, 2 Jun 2014 19:29:10 +0000 (19:29 +0000)]
am
362d2d41: am
333005f1: am
c706ea79: Merge "Include selinux_version file with builds."
* commit '
362d2d4123a755a3e39a2015cf49da7db24a26ad':
Include selinux_version file with builds.
Nick Kralevich [Mon, 2 Jun 2014 19:27:04 +0000 (19:27 +0000)]
am
333005f1: am
c706ea79: Merge "Include selinux_version file with builds."
* commit '
333005f1bfa7dc36d327ddb45fdf8fa2d38ca768':
Include selinux_version file with builds.
Nick Kralevich [Mon, 2 Jun 2014 19:25:21 +0000 (19:25 +0000)]
am
c706ea79: Merge "Include selinux_version file with builds."
* commit '
c706ea79629792f4432774643887f5681e8f145d':
Include selinux_version file with builds.
Nick Kralevich [Mon, 2 Jun 2014 19:23:11 +0000 (19:23 +0000)]
Merge "Include selinux_version file with builds."
Primiano Tucci [Mon, 2 Jun 2014 16:37:38 +0000 (17:37 +0100)]
Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)
Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
Dirk Dougherty [Mon, 2 Jun 2014 04:28:20 +0000 (21:28 -0700)]
css adjustments for headings with dynamic content
Change-Id: I54e184b10677b21003bd282919423b525b8aa705
Dirk Dougherty [Sat, 31 May 2014 17:02:00 +0000 (17:02 +0000)]
am
93d62e61: am
e445387e: am
e2adcfef: am
518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit '
93d62e613221f92a68846523616028fa922a0f43':
Fix g-plusone data-href references for cards pointing to static content.
Dirk Dougherty [Sat, 31 May 2014 16:57:01 +0000 (16:57 +0000)]
am
e445387e: am
e2adcfef: am
518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit '
e445387e560f7116087a327d43405f24c9e3ff08':
Fix g-plusone data-href references for cards pointing to static content.
Dirk Dougherty [Sat, 31 May 2014 11:44:03 +0000 (11:44 +0000)]
am
e2adcfef: am
518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit '
e2adcfefd32338cacd9837ba18e310f7c647e766':
Fix g-plusone data-href references for cards pointing to static content.
Dirk Dougherty [Sat, 31 May 2014 11:09:48 +0000 (11:09 +0000)]
am
518ed145: Fix g-plusone data-href references for cards pointing to static content.
* commit '
518ed145b17ad1fa66a0b8238469b6d13819f008':
Fix g-plusone data-href references for cards pointing to static content.
Dirk Dougherty [Sat, 31 May 2014 04:24:42 +0000 (21:24 -0700)]
Fix g-plusone data-href references for cards pointing to static content.
Change-Id: I762e098db2c51c5687e9727b83bddb2a891ac289
Stephen Hines [Fri, 30 May 2014 23:15:43 +0000 (23:15 +0000)]
am
15d49c3b: am
85e0dce5: am
a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '
15d49c3b30d320422d0209c8726eb0c5cec92d41':
Add -shared to clang LDFLAGS.
Stephen Hines [Fri, 30 May 2014 23:08:50 +0000 (23:08 +0000)]
am
85e0dce5: am
a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '
85e0dce5f49bfcad97494a674f8a50219914962a':
Add -shared to clang LDFLAGS.
Stephen Hines [Fri, 30 May 2014 23:04:37 +0000 (23:04 +0000)]
am
a8b65126: Merge "Add -shared to clang LDFLAGS."
* commit '
a8b65126cae5335d4c8b31fbf7700907fd2c48dd':
Add -shared to clang LDFLAGS.
Nick Kralevich [Fri, 30 May 2014 23:02:54 +0000 (23:02 +0000)]
am
ee7493cc: am
329988c2: am
a42e0f50: Merge "arm64: restore relro/now"
* commit '
ee7493ccb91256e61414e8e0bad8d7173cb5d22e':
arm64: restore relro/now
Stephen Hines [Fri, 30 May 2014 22:59:48 +0000 (22:59 +0000)]
Merge "Add -shared to clang LDFLAGS."
OSDN Git Service
