5772ce6130
Sync master templates with upstream branch, retain annotation customization from master.
...
Change-Id: Ie1119bc1b18a017e1bef199949801fb045d8ff06
2014-05-14 15:04:40 -07:00
efb9987de6
am 8fdd4a0b: am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
...
* commit '8fdd4a0b567878c5cf0aaa9f24496f5888239fea':
Add templates support for dynamic content and sticky nav bar.
2014-05-14 21:09:39 +00:00
8fdd4a0b56
am 7db3e8a5: am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
...
* commit '7db3e8a518ee51ba1a511948de71675e3457ff13':
Add templates support for dynamic content and sticky nav bar.
2014-05-14 21:02:39 +00:00
7db3e8a518
am 9890fe24: am c3921656: Add templates support for dynamic content and sticky nav bar.
...
* commit '9890fe24f1451d0393337904852d0ca24808c2bc':
Add templates support for dynamic content and sticky nav bar.
2014-05-14 20:56:51 +00:00
c3921656f5
Add templates support for dynamic content and sticky nav bar.
...
Change-Id: Icb4e492a991a19e3e1eac72eafc83623b00be5de
2014-05-14 12:00:34 -07:00
15d5348e6c
Reopen temporary system image to avoid stale data.
...
NamedTemporaryFile's aggressive caching behavior can cause an issue
where changes made by another process aren't visible even after the
fseek() below or a flush(). To avoid this, simply open the file
again and read from the fresh version.
This fixes an issue where verity metadata written by append2simg
doesn't become visible to img_from_target_files.
Change-Id: I291fb3a95d5b532218ac6205ecc9e9b4f3a36bd4
2014-05-13 20:23:54 -07:00
c10320eef3
Merge "Add verity support to `make dist`."
2014-05-12 17:00:58 +00:00
5b5f4958d8
Add verity support to `make dist`.
...
Without this, system images will be built that do not contain the
necessary bits for verification.
Change-Id: I87c15282b26377d7a2a1540e3d0e30b0299622e3
2014-05-10 18:31:07 -07:00
bd58064a62
am 17b3567b: am e4af3b35: am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav
...
* commit '17b3567b064fa8d8637113c49014494e25241aa6':
update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
2014-05-10 00:23:05 +00:00
17b3567b06
am e4af3b35: am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the he
...
* commit 'e4af3b35588932d9f14eacaee783bb6fcff0d72b':
update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
2014-05-10 00:18:17 +00:00
e4af3b3558
am 18ba007b: am 7a6ab434: update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is
...
* commit '18ba007b371478254faa43f563ee28295e7d742d':
update wear header template to support sticky nav. moved the search and menu markup for the header into a method call. also update the styles and script so that when a page does not belong to a primary horizontal-nav link, the header logo is used for the breadcrumb's first link and text.
2014-05-10 00:13:27 +00:00
4f12fceead
Add missing quotation mark in assertion
...
Change-Id: I3e76997fe257bfccb7d61dcc1273e014cdb55a41
2014-05-09 14:14:42 -07:00
91a99c28e0
fix ota script to generate non-block commands correctly
...
If you had a target_files without a recovery patch and specified
--block (which should have no effect without a patch), it would have
omitted some necessary commands from the OTA script.
Change-Id: I96e79cd561ebf09cfe53792d1cc558cc71479869
2014-05-09 13:16:50 -07:00
7a6ab434bc
update wear header template to support sticky nav.
...
moved the search and menu markup for the header into a method call.
also update the styles and script so that when a page does not belong
to a primary horizontal-nav link, the header logo is used for the breadcrumb's
first link and text.
Change-Id: I14129fe7657924e2037c103674e09322c4c31db8
2014-05-09 12:16:14 -07:00
af845256f1
assert recovery finger/thumbprints, not system
...
Block OTAs don't have the system partition mounted and so can't use
file_getprop on the system partition. Make assertions look at the
recovery system finger/thumbprints, which should be the same as the
ones on the system partition (even for sprout devices).
Change-Id: Ie5d329d13beab4b428e37f75da9b9e1b8ceb35bc
2014-05-09 08:29:05 -07:00
3e92fd0fba
Fix build: Revert "Add verity support to `make dist`."
...
This reverts commit 5dee206d8e
2014-05-09 05:53:54 +00:00
5dee206d8e
Add verity support to `make dist`.
...
Without this, system images will be built that do not contain the
necessary bits for verification.
Change-Id: Icaa636085dbfd386424c90dfbe404c5960df0fe4
2014-05-06 18:06:18 -07:00
0a2ce08f66
Merge "Support block OTA + OEM partition"
2014-05-05 19:57:56 +00:00
c6e3afd26d
Support block OTA + OEM partition
...
Change-Id: I9e662098569a43b05279908e6833e9552a7abe3a
2014-05-05 12:22:12 -07:00
e8eef02cca
Merge "verity: switch to C++ version of build_verity_tree"
2014-05-02 23:52:16 +00:00
03257fe50c
am d19aa4ba: am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
...
* commit 'd19aa4bae2161f89966e38cb099f2f080e2bbfac':
Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 23:03:45 +00:00
d19aa4bae2
am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
...
* commit '611d7e14e87d030cd5d89b932a1877289ab68e8d':
Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 22:58:02 +00:00
611d7e14e8
am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
...
* commit '379d9968ccc31701053eca7e0d809f2f52c0b964':
Merge changes from templates-sdk to templates-sdk-dyn.
2014-05-02 22:54:45 +00:00
e21bed28ac
Merge changes from templates-sdk to templates-sdk-dyn.
...
Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
2014-05-02 15:44:20 -07:00
6e836116f7
Add support for verifying OEM properties.
...
A separate OEM file must be specified to provide the expected
values for these properties. The list of properties comes from
the "oem_fingerprint_properties" list in misc_info.txt
Bug: b/13367676
Change-Id: I1a3eaf108492132cf6f595a5d1c9f7e0c3cb3142
2014-05-01 17:37:57 -07:00
1e4adfa837
Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD
2014-04-29 11:32:53 -07:00
477cf2b029
verity: switch to C++ version of build_verity_tree
...
The C++ version avoids the need to unsparse the image to generate
the verity image, and is much faster for images with large regions
of don't care (treated as zeroes).
Change-Id: I8396b08a5fdb93f27d8c71c9c1ac23cb75cf1f7f
2014-04-28 17:19:13 -07:00
b8888432f0
Set up rules to build oem.img
...
To build oem.img:
- You must define BOARD_OEMIMAGE_PARTITION_SIZE in your BoardConfig.mk
- The file system type will be the same as system.img and userdata.img.
- To install a module to oem.img, use "LOCAL_OEM_MODULE := true"
- run "make -j48 showcommands oem_image dist". By default it's not
built.
Bug: 13367676
Change-Id: I1a26d4d0c61b72ecffe60279667b1b3de050780d
2014-04-28 09:43:51 -07:00
6ee3c4327d
Add new facility to have multiple active codenames.
...
Use this to have both L and KKWT.
Change-Id: I78cd5ed2dcffab9e93030184ba6f9eb9a6a3cba5
2014-04-24 16:19:14 -07:00
c73e461537
Fix variable name.
...
Change-Id: Ie7439f71cf7fd2eeacd45a5d6625e610dad8bfbe
(cherry picked from commit 1a1dfcb5fcb6eda11d8dbf5df02f0083853dd5c1)
2014-04-15 22:31:54 +00:00
e65e213444
am 554bb7b6: am cdbb1241: am 01adbdcb: am 613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
...
* commit '554bb7b61081e80d79bf29a3690ba6fff391df55':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
2014-04-15 20:52:27 +00:00
114b46f15d
Accomodate to the import syntax in build.prop.
...
Bug: 14024566
Change-Id: I71692244fabcd4d12f65849ffa027295b3a2a79a
(cherry picked from commit 092fea0d3e644573d7f0dbfe6692f42431f83c5c)
2014-04-15 20:28:53 +00:00
5a7ad0338b
Accomodate to the import syntax in build.prop.
...
Bug: 14024566
Change-Id: I70b8d3c8cfc968a7f039728375f3f7f341cdc11a
2014-04-15 12:37:13 -07:00
554bb7b610
am cdbb1241: am 01adbdcb: am 613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
...
* commit 'cdbb12418943889a86576b24ae91ddd6a2b5340e':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
2014-04-15 02:46:17 +00:00
cdbb124189
am 01adbdcb: am 613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
...
* commit '01adbdcb954e2d694ec40ac149f07c44defcc796':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
2014-04-15 02:44:48 +00:00
613b251b7b
Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
2014-04-15 02:38:35 +00:00
4868e9bf92
remove the animated scroll adjustment for sticky nav.
...
Instead adjust the scroll position based on changes to the hashtag.
Change-Id: I34a6b386fa2104f8f2ac04e1d9820199f0ef0e94
2014-04-14 19:00:12 -07:00
74e22573a6
am 78f264f7: am 3829f621: am b1a6d644: am 1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
...
* commit '78f264f79be427d4bbe6446c1e4893b1526e76d7':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
2014-04-14 15:49:36 +00:00
7b1fe64cfd
am 7de9c942: am 45094b5d: am d0c6f0a1: am 318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
...
* commit '7de9c94263c48c00b52a9d2feccd51b477aacac1':
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
2014-04-14 15:49:19 +00:00
78f264f79b
am 3829f621: am b1a6d644: am 1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
...
* commit '3829f62188161fe7528e18de7bb226896611fee0':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
2014-04-14 15:01:48 +00:00
3829f62188
am b1a6d644: am 1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
...
* commit 'b1a6d6441a02478569e57a5da5b9655dd1409efa':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
2014-04-14 14:58:17 +00:00
1670cca5f9
Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
2014-04-14 14:52:32 +00:00
7de9c94263
am 45094b5d: am d0c6f0a1: am 318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
...
* commit '45094b5d05e1e88d4cd389331c2faa1a52d1d68d':
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
2014-04-14 03:06:37 +00:00
45094b5d05
am d0c6f0a1: am 318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
...
* commit 'd0c6f0a11c0a29b3bb0ebabf6522cdf4f401456a':
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
2014-04-14 03:04:01 +00:00
318fb97168
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
...
Change-Id: Ib140e7025360d60e6fb49e1e6c45e2c7ccc72cda
2014-04-13 19:57:44 -07:00
d6a8e662cf
make the sticky bar aware of search result visiblity.
...
Fixes a bug that caused the sidenav to overlap search results.
Change-Id: I3dc431f46cd96164dd79f3d0461f5034cc912099
2014-04-12 16:40:48 -07:00
e737ca9a02
am 7bb8315c: am 4786cc3b: am de22e6fb: am 20cf2a91: update sticky nav to sync with sidenav and build the breadcrumbs dynamically
...
* commit '7bb8315cf6d0576f8663ced6d102e60112bec27c':
update sticky nav to sync with sidenav and build the breadcrumbs dynamically
2014-04-11 09:00:56 +00:00
7bb8315cf6
am 4786cc3b: am de22e6fb: am 20cf2a91: update sticky nav to sync with sidenav and build the breadcrumbs dynamically
...
* commit '4786cc3b132037f187c798593575e0053074b653':
update sticky nav to sync with sidenav and build the breadcrumbs dynamically
2014-04-11 08:57:50 +00:00
4786cc3b13
am de22e6fb: am 20cf2a91: update sticky nav to sync with sidenav and build the breadcrumbs dynamically
...
* commit 'de22e6fb9bd31e6c41ebdb43b28d0b8fd719a80f':
update sticky nav to sync with sidenav and build the breadcrumbs dynamically
2014-04-11 08:54:39 +00:00
20cf2a91f0
update sticky nav to sync with sidenav
...
and build the breadcrumbs dynamically
Change-Id: Ib008d4606a8e82c468be75c051a8a9e623dc7c22
2014-04-10 20:13:54 -07:00
26e1a28e7f
Pass OEM property list to OTA tools, thumbprint.
...
The OTA generation scripts need to know what system properties to
read from the OEM partition, so pass along from product definition.
Also define "thumbprint" which is only the build-specific parts of
the fingerprint. (Thumbs are smaller than fingers.)
Bug: 13367676
Change-Id: Iae051dcd2b1c67a7c8554d8ae318a4c54a86d614
2014-04-09 15:00:36 -07:00
491055df99
Merge "Import OEM build properties, if defined."
2014-04-09 15:44:06 +00:00
110ea46e09
resolved conflicts for merge of 8af7e8ed to master
...
Change-Id: Ib427b36e133e29d1c2e9cea065e4e63c1e2e2122
2014-04-09 12:33:03 +01:00
8af7e8ed3e
resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp
...
Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96
2014-04-09 10:03:41 +01:00
7303ebda84
Add 32 / 64 bit abi lists to system properties.
...
Introduce ro.product.cpu.abilist32 / abilist64, which are
comma separated lists of the 32 and 64 bit ABIs that the
device supports. These properties are used by the zygote and
system server to determine what ABI an app should be
started with.
This changes move abilist related make steps out of envsetup.mk
and into config.mk because they depend on variables set by
core/combo/***. Additionally, config.mk performs a few additional
cleanups of these variables (like stripping them) after the
inclusion of envsetup.mk so this seems like a better place to
put them.
bug: 13647418
Change-Id: I3db39bdd761220c5b4966f651892fb592396f9a1
2014-04-08 17:40:40 +01:00
eed8e1a2f6
am 049808e3: am d031b4de: am 98cc173c: am 46b443ac: Adjust opacity for non-hover states and a few others.
...
* commit '049808e3263bb347e6a1eced99b348f98174c636':
Adjust opacity for non-hover states and a few others.
2014-04-08 01:19:07 +00:00
049808e326
am d031b4de: am 98cc173c: am 46b443ac: Adjust opacity for non-hover states and a few others.
...
* commit 'd031b4de79308fa347ae6b38f552e535a9ecef64':
Adjust opacity for non-hover states and a few others.
2014-04-08 01:13:15 +00:00
d031b4de79
am 98cc173c: am 46b443ac: Adjust opacity for non-hover states and a few others.
...
* commit '98cc173c165fa2141426464a4205441617ba3bd2':
Adjust opacity for non-hover states and a few others.
2014-04-08 01:08:06 +00:00
46b443acbd
Adjust opacity for non-hover states and a few others.
...
Change-Id: I8a6dee3e25bc8e6c3f1ca19d4e68037df5ce9b91
2014-04-07 11:55:27 -07:00
31bfe8385f
am 5fe1b387: am 812d3d47: am 08032409: Add basic support for rendering dynamic content on pages.
...
* commit '5fe1b387aace96990723c16e3e23a27b166483c5':
Add basic support for rendering dynamic content on pages.
2014-04-03 02:11:16 +00:00
5fe1b387aa
am 812d3d47: am 08032409: Add basic support for rendering dynamic content on pages.
...
* commit '812d3d478be650f5b5bb1dfe00d6131986c26886':
Add basic support for rendering dynamic content on pages.
2014-04-02 23:35:43 +00:00
812d3d478b
am 08032409: Add basic support for rendering dynamic content on pages.
...
* commit '08032409b4dd29740e1c8e703eada0d1ce86e58c':
Add basic support for rendering dynamic content on pages.
2014-04-02 23:32:20 +00:00
08032409b4
Add basic support for rendering dynamic content on pages.
...
Change-Id: If3ba4f71771a01043ec6d544e3b4a9222ba35daf
2014-04-02 12:48:41 -07:00
b4d757b1b2
am f6811abe: am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
...
* commit 'f6811abe12601c9753f329cb34da568f0072ca76':
Extend the CPU ABI specification mechanism.
2014-03-31 12:35:14 +00:00
f6811abe12
am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
...
* commit '9fbd3afdecc2fee211c11a6aedb39422fa8dd773':
Extend the CPU ABI specification mechanism.
2014-03-31 12:21:55 +00:00
1a43b375b4
Extend the CPU ABI specification mechanism.
...
Add a (read only) system property that is a comma
separated list of ABIs supported by the device in order
of preference. For example, typical arm-v8 device might
define:
ro.cpu.abilist = arm64-v8a,armeabi-v7a,armeabi
For most purposes, a single flattened list like the above is
probably more useful than the parallel system of variables
TARGET_CPU_ABI{2} / TARGET_2ND_ARCH_CPU_ABI{2} that we use
in the build system.
Change-Id: If9102669ad9f5f8fd89a8bcc5bf88cca1acadc3c
2014-03-28 17:10:47 +00:00
a1cda0e3cf
am 4a942fbb: am 35fcac0f: am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen
...
* commit '4a942fbb4403d0ad9079eb17c6944b7efc19bfd9':
fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:25:54 +00:00
4a942fbb44
am 35fcac0f: am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen
...
* commit '35fcac0f417cab5aaef9de7fae1376224a82ce0a':
fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:19:22 +00:00
35fcac0f41
am 70c9c2d8: am a36253b8: fix viewport width variable by using underscore instead of hyphen
...
* commit '70c9c2d82ba5d4647fdc6552a21130b19281849a':
fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:14:03 +00:00
70c9c2d82b
am a36253b8: fix viewport width variable by using underscore instead of hyphen
...
* commit 'a36253b8b05d94fb27a67522757b07781da2bd43':
fix viewport width variable by using underscore instead of hyphen
2014-03-27 20:08:18 +00:00
a36253b8b0
fix viewport width variable by using underscore instead of hyphen
...
Change-Id: I866fa7016453b9e242df5e68f26bf94eac672feb
2014-03-27 12:56:26 -07:00
7964804dd2
am 5429cdc2: am bb3ed6fb: am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
...
* commit '5429cdc2c84bd753202897a7b3437a7fc522fd8b':
add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:35:37 +00:00
4f31196420
am 9e81f2c2: am 97d326ea: am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite
...
* commit '9e81f2c2ece29e97d2ff87440ab18550add5170c':
Update the sdk templates to support the Android Wear microsite
2014-03-27 03:35:36 +00:00
5429cdc2c8
am bb3ed6fb: am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
...
* commit 'bb3ed6fb476f0e072a2f8e4c34cda6c5afd2116c':
add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:29:02 +00:00
9e81f2c2ec
am 97d326ea: am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite
...
* commit '97d326ea1974bc0f060974c341767cd298196842':
Update the sdk templates to support the Android Wear microsite
2014-03-27 03:29:01 +00:00
bb3ed6fb47
am b8702917: am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
...
* commit 'b8702917c61923bc4dc5f6284482e1296b783bd4':
add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:23:11 +00:00
97d326ea19
am 514c8254: am 4b270cdf: Update the sdk templates to support the Android Wear microsite
...
* commit '514c8254d0a78a4153c442bc0789da8a10ce8b0b':
Update the sdk templates to support the Android Wear microsite
2014-03-27 03:23:11 +00:00
b8702917c6
am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
...
* commit '75f21bc79e18f5bdf7676eeab6681e8f4a32e688':
add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
2014-03-27 03:17:10 +00:00
514c8254d0
am 4b270cdf: Update the sdk templates to support the Android Wear microsite
...
* commit '4b270cdf3678998370c2c3629711797ec7ab8a5a':
Update the sdk templates to support the Android Wear microsite
2014-03-27 03:17:09 +00:00
75f21bc79e
Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
2014-03-27 03:15:19 +00:00
e921b6dedc
add 2x header logo and add override to viewport width for landing pages.
...
changing the viewport to 970 ensures proper layout space for floating divs.
Change-Id: Iea980b4dfe1cca8a2b517f171a847a0e2788b1f0
2014-03-26 20:12:35 -07:00
4b270cdf36
Update the sdk templates to support the Android Wear microsite
...
Change-Id: I848f442b3bc66ee2fb87db8200df370d13762d29
2014-03-26 19:04:26 -07:00
ab589ea6eb
am 27de0f14: am 816979cc: am d9bc3eda: am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
...
* commit '27de0f1471daa2f7b35fff41a1fcb04f91dc8c90':
docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 21:23:54 +00:00
816979cc42
am d9bc3eda: am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
...
* commit 'd9bc3eda8f8af202071023ffb93aaee96653dc92':
docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 20:36:42 +00:00
8113e43601
am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
...
* commit '49b4ef0badd51ce3af0511206e20114414a6c427':
docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 20:33:46 +00:00
d9bc3eda8f
am 49b4ef0b: am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
...
* commit '49b4ef0badd51ce3af0511206e20114414a6c427':
docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 20:33:03 +00:00
49b4ef0bad
am fd0be925: docs: Added SDK version to the ADT bundles download path in the CS template.
...
* commit 'fd0be925bb6e34768f9f11cf5325d1fcfbf39410':
docs: Added SDK version to the ADT bundles download path in the CS template.
2014-03-25 20:27:48 +00:00
fd0be925bb
docs: Added SDK version to the ADT bundles download path in the CS template.
...
Change-Id: Ib222684754779b908cb10e6d8f9e5778101c9b96
2014-03-25 12:33:33 -07:00
26d22f7139
Import OEM build properties, if defined.
...
Certain products can define a list of system properties that should be
delegated to the OEM. Since these properties may be ro.*, we give
them first shot at defining.
Also support blacklist of properties that should never be defined by
build.prop, used to delegate to runtime fingerprint generation.
Bug: 13367676
Change-Id: I3f00db732f485818205a7b76b31edbdc3a89aac0
2014-03-21 13:22:54 -07:00
31fa3772a1
am 7c3e03cf: am ce1ea340: am 7250ac63: am bb79f9d2: am b7b49711: add some css to support android wear sub-site
...
* commit '7c3e03cfe869b19b9fc566d65a980a6761229d35':
add some css to support android wear sub-site
2014-03-18 12:46:55 +00:00
ce1ea34010
am 7250ac63: am bb79f9d2: am b7b49711: add some css to support android wear sub-site
...
* commit '7250ac63e5a3f7d04f055ccb53b5a1f32f4c11e1':
add some css to support android wear sub-site
2014-03-18 12:41:07 +00:00
1cc00e3116
am bb79f9d2: am b7b49711: add some css to support android wear sub-site
...
* commit 'bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82':
add some css to support android wear sub-site
2014-03-18 12:38:11 +00:00
7250ac63e5
am bb79f9d2: am b7b49711: add some css to support android wear sub-site
...
* commit 'bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82':
add some css to support android wear sub-site
2014-03-18 12:37:22 +00:00
bb79f9d2a5
am b7b49711: add some css to support android wear sub-site
...
* commit 'b7b497115fb19d17a3e5de20646a5eac759c0095':
add some css to support android wear sub-site
2014-03-18 12:35:42 +00:00
b7b497115f
add some css to support android wear sub-site
...
Change-Id: Ibce2c596219fb86f433075c88a0af9d0cc1007b3
2014-03-18 05:32:26 -07:00
34306a6dc2
am 25f47659: am 05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"
...
* commit '25f47659d7cc0e7b9d65ab8ce070fc7b00c4976c':
Docs: replacing analytics ID from D.A.C. Bug: 11476435
2014-03-11 18:52:28 +00:00
04a689140b
am 25f47659: am 05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"
...
* commit '25f47659d7cc0e7b9d65ab8ce070fc7b00c4976c':
Docs: replacing analytics ID from D.A.C. Bug: 11476435
2014-03-10 18:55:24 +00:00
2bdf5e97bc
am cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
...
* commit 'cd958154a5bdb753274a338e799c3ece96ea9c5c':
Refactor a little bit and do the validation on also default.prop.
2014-03-07 02:29:21 +00:00
0dd00d3d00
am de90b030: Merge "A build property\'s value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message."
...
* commit 'de90b0307a603449354bb2d265c5b2315b7b6850':
A build property's value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message.
2014-03-07 02:27:35 +00:00
2a99239920
Merge "test block system image patch at build time"
2014-03-06 16:39:20 +00:00
231f3d03ae
Docs: replacing analytics ID from D.A.C.
...
Bug: 11476435
Change-Id: I834646e6a618709fe21afa5958bd28f822991e29
2014-03-05 12:20:46 -08:00
922206ec2a
move data wipe to end of OTA package
...
Now that OTA packages can be downloaded to /data, if they include a
data wipe we should do that last.
Change-Id: I75102fb2ff85d0f0110d55dfca06ec5f38104850
2014-03-04 13:16:24 -08:00
32b527d6cb
test block system image patch at build time
...
After building a patch for the system image (for incremental block
OTAs), apply it to a local copy of the file and test that it succeeds.
This is an imperfect test as it's using the local client's
syspatch_host, which may differ from the syspatch library actually
used in the target build, but it's somewhat better than nothing.
Change-Id: Ic0001b0145881e2ebd4b5b36ce9b5bcebd76deb4
2014-03-04 10:03:02 -08:00
5fad2039bb
handle don't care regions in the system image
...
The system partitions has regions that we shouldn't write and can't
depend on the contents of. Adds a new script to generate a map of
these regions (using the sparse image as input), and include the map
in the package zip so it can be used when writing or patching the
system partition.
Also fixes a bug where the wrong SELinux file contexts are used when
generating incrementals.
Change-Id: Iaca5b967a3b7d1df843c7c21becc19b3f1633dad
2014-03-03 10:57:23 -08:00
25568486e5
add option to specify updater binary, for development
...
Change-Id: I5f239afff70c87fb16ddc4b8abefa7bbcda6040d
2014-03-03 10:21:27 -08:00
26e6619c37
add --block flag to ota_from_target_files
...
Add the --block flag to this script to control whether block-based OTA
packages are generated (defaults to off). Make the full OTA package
produced by "make otapackage" continue to produce a block-based OTA.
Also fix a problem where block incremental OTAs didn't ever succeed,
and the --no_signing option never worked.
Change-Id: I610d0b4abed4b8b65fbe8ce0abaeec6cf52e14a1
2014-02-20 13:30:44 -08:00
d75d7128ce
Merge "Add support for block incremental OTAs"
2014-02-20 21:10:39 +00:00
36bd365625
Add support for block incremental OTAs
...
Change-Id: Ie72015e34ed8d7595a5c74c8df41cba73275afab
2014-02-20 12:54:17 -08:00
4abfeaa358
Merge "rebuild recovery patch in sign_target_files_apks"
2014-02-20 16:33:36 +00:00
cf6d5a9074
bump releasetools python requirement to 2.7
...
These scripts already use some post-2.4 features, so let's make it
official: Python 2.7 is needed to run them.
Change-Id: I256e9ed99b0b62abe4e22a7b1f811acb7419e88e
2014-02-18 10:57:07 -08:00
5f977bb9e1
am bdaf9012: am 98756f3b: am 8a56079c: am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
...
* commit 'bdaf90122ae93469175304be6bee4ad0f0375639':
New temporary templates set for dynamic content support.
2014-02-15 18:25:38 +00:00
bdaf90122a
am 98756f3b: am 8a56079c: am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
...
* commit '98756f3b7e16558ae4e17891237163ab8a23c462':
New temporary templates set for dynamic content support.
2014-02-15 18:20:12 +00:00
8a56079c74
am 5c92d966: am 541b4941: New temporary templates set for dynamic content support.
...
* commit '5c92d966076b28024a9efd6c8456445e207748f1':
New temporary templates set for dynamic content support.
2014-02-15 18:14:37 +00:00
5c92d96607
am 541b4941: New temporary templates set for dynamic content support.
...
* commit '541b494103857da31505ba745b0da5bdbe0499b9':
New temporary templates set for dynamic content support.
2014-02-15 18:12:08 +00:00
541b494103
New temporary templates set for dynamic content support.
...
Change-Id: I066e43cdebaf66c0d8b5e3622a286dc2c88c47b5
2014-02-14 18:31:53 -08:00
412c02fffb
rebuild recovery patch in sign_target_files_apks
...
The target_files zip should now contain the recovery-from-boot patch
and the script to install it. This means that sign_target_files_apks,
which generates a signed target_files from an unsigned target_files,
now needs to recompute the patch and script (taking into account the
key replacement, property changes, etc., that it does) so its output
contains the correct patch.
Change-Id: I18afd73864ba5c480b7ec11de19d1f5e7763a8c0
2014-02-13 10:58:24 -08:00
0a60bdf59a
am 0b7197a6: am cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
...
* commit '0b7197a612459caf2cdac8b9f0c0b8c5365b7837':
Refactor a little bit and do the validation on also default.prop.
2014-02-12 23:00:19 +00:00
3afdef2ef0
am ca23f57c: am de90b030: Merge "A build property\'s value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message."
...
* commit 'ca23f57c419e99ae49714c71ad9eb2a689435580':
A build property's value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message.
2014-02-12 23:00:17 +00:00
0b7197a612
am cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
...
* commit 'cd958154a5bdb753274a338e799c3ece96ea9c5c':
Refactor a little bit and do the validation on also default.prop.
2014-02-12 21:01:03 +00:00
ca23f57c41
am de90b030: Merge "A build property\'s value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message."
...
* commit 'de90b0307a603449354bb2d265c5b2315b7b6850':
A build property's value is returned empty in runtime when its length exceeds 92 symbols (91 valid symbols + \0). It is better to catch that issue on earlier stage, i.e. fail the build with an appropriate message.
2014-02-12 19:22:53 +00:00
351232107e
Refactor a little bit and do the validation on also default.prop.
...
Change-Id: I76c2344d9033eadede7048689a879c9a69a05b7f
2014-02-12 10:32:47 -08:00
3634c0dfc1
am 0ed897d0: am 83aeb2f9: am e2652df8: am 22866695: am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
...
* commit '0ed897d01536129165f5df63120a791d933a2865':
set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:16:05 +00:00
e2652df8d7
am 22866695: am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
...
* commit '228666956ade81aa8f993eed70f361ec93073bad':
set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:06:03 +00:00
228666956a
am 2c2c0534: set a smaller line height for sidebox headers to avoid whitespace at the top
...
* commit '2c2c053490aa3a2102c0dce95fcae0d22b77a71b':
set a smaller line height for sidebox headers to avoid whitespace at the top
2014-02-12 16:02:57 +00:00
2c2c053490
set a smaller line height for sidebox headers to avoid whitespace at the top
...
Change-Id: I8f1c4de275f3d7b2f55460bf4dc32a9a3d6b04ae
2014-02-11 18:16:20 -08:00
115c66bd74
A build property's value is returned empty in runtime when its length
...
exceeds 92 symbols (91 valid symbols + \0). It is better to catch that
issue on earlier stage, i.e. fail the build with an appropriate message.
For developer's build, show warning message instead of failing the build
(in the latter case, as developers do not usually care about build properties
too much).
Change-Id: I03ced7b486d43a71b1921e0a9c48b43aa30727c7
2014-02-11 15:31:49 -08:00
64a55babf2
Fix typo.
...
Change-Id: I01a1762fe449e02ff80a5ea7a3ee1c529e5da902
2014-02-05 12:15:06 -08:00
d89ffa8623
Fix emulator builds
...
which don't have boot.img.
Change-Id: Id97a53c5356d435d9c70107ef047bed003769e22
2014-02-05 11:29:34 -08:00
01ce19c95f
make full OTAs block based
...
Instead of writing individual files and fixing up their metadata, make
full OTAs contain a system image and simply write it to the block
device.
This is only done for target-files that already contain the recovery
flashing information, older target-files still get a file-based full
OTA.
Bug: 12893978
Change-Id: If7586083c8f275e24fec49d260af5b5aff4a0a88
2014-02-04 14:04:42 -08:00
c9253822ea
add recovery update code to system images
...
Currently, the "img" zip files generated by the build system lack the
script and data needed to rewrite the recovery partition, while the
"ota" zip files do (when installed).
In order to move towards block-based OTAs, we want the result of
flashing an image and the result of installing the corresponding OTA
package to be identical.
Generate the recovery-from-boot patch and install script as part of
the process of building the target-files. This requires breaking the
code to generate that out of ota_from_target_files into its own tool
that we can run from the Makefile. (ota_from_target_files can still
do this, so it continues to work with older target-files.)
Bug: 12893978
Change-Id: I80e62268840780b81216e548be89b47baf81b4ac
2014-02-04 13:50:35 -08:00
062f3564a7
am 22770383: am bb783f27: am a6e8c6c1: am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
...
* commit '2277038372e0e5c2a3f5c5a90f98eded41bc22a9':
add 'get started' link to the bottom of class home pages
2014-01-30 01:58:01 +00:00
a6e8c6c1e0
am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
...
* commit 'f72e1846898ec07cedf301ac76875cfa9f1164bc':
add 'get started' link to the bottom of class home pages
2014-01-29 20:11:48 +00:00
f72e184689
am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
...
* commit 'c9e142e62d60b39bb5bd3459358a16c00fc557f3':
add 'get started' link to the bottom of class home pages
2014-01-29 20:08:49 +00:00
c9e142e62d
Merge "add 'get started' link to the bottom of class home pages" into klp-docs
2014-01-29 20:07:13 +00:00
eb18125f2f
am 0064dceb: am a8d15474: am 04cff708: resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
...
* commit '0064dceb198788e237bbc10931c54b9a35275976':
ota_from_target_files: Add an option to not sign OTA packages
2014-01-28 00:13:04 +00:00
04cff70804
resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
...
Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52
2014-01-27 15:56:45 -08:00
eb0a78afc0
prefer releasetools.py from target_files zip
...
If the target_files zip for the target build contains a
META/releasetools.py (which it has since Nov 2013), prefer that over
using a releasetools.py from the local client.
Explicitly specifying the device-specific extensions path via
command-line options takes priority over both of the above mechanisms.
Change-Id: Ia068b0e2e06ede7da89ebe4315cdec592eb8995e
2014-01-27 10:03:23 -08:00
e153b34643
ota_from_target_files: Add an option to not sign OTA packages
...
Sometimes it is useful to be able to tell ota_from_target_files
to not sign the output zip file. For instance, the private
release key may not be available when ota_from_target_files
is executed; similarly the release tools may not be available
or executable where the private key is stored.
This change adds an option, '--no_signing', to simply output the
unsigned OTA zip file, instead of spuriously signing it with the
test key even though the zip file would need to be re-signed later
with a different key.
Change-Id: I1f3c4dc8ffa35ce85478f848b147aff3d40fe283
2014-01-27 15:01:04 +09:00
1f12160606
Add preliminary support for dynamic content js and css.
...
Change-Id: I1dbc92356e8d4beb712b8872e9b6cf873bdb70be
2014-01-23 19:10:05 -08:00
9ee0fae1e8
add 'get started' link to the bottom of class home pages
...
Change-Id: I0f4615562efca083e7d1c50bb9e9eaa2cc250ced
2014-01-23 16:43:47 -08:00
fae3252944
am c3fb41d0: am 2171a443: am 829e4db4: am 0bb2c170: Merge commit \'bb94d790\' into manualmerge
...
* commit 'c3fb41d0cd7c172934054794368587d6f62b686b':
Support generated samples_toc.cs file.
2014-01-23 01:09:38 +00:00
829e4db46f
am 0bb2c170: Merge commit \'bb94d790\' into manualmerge
...
* commit '0bb2c1702a0ca2b174b70ac2d5364548453ba524':
Support generated samples_toc.cs file.
2014-01-22 17:03:21 -08:00
0bb2c1702a
Merge commit 'bb94d790' into manualmerge
...
Conflicts:
tools/droiddoc/templates-sdk/sample.cs
Change-Id: Ic1640c3620eb6b770bae7766af9ea5c64d74afe0
2014-01-22 17:00:19 -08:00
bb94d79028
Support generated samples_toc.cs file.
...
(cherry picked from commit d239e4c9b5
2014-01-23 00:33:49 +00:00
52ad1d7043
am 1a4520a5: am d961b7d0: am 5636d07a: am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files
...
* commit '1a4520a5680a05a360986b260d15e170ed899da5':
Enabled incrementals to patch + rename moved files
2013-12-26 23:50:25 +00:00
5636d07a29
am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files
...
* commit 'a80542dbf4f193c59525b8749871bcdf4ae4283a':
Enabled incrementals to patch + rename moved files
2013-12-26 15:33:27 -08:00
a80542dbf4
am 4038aa8f: Enabled incrementals to patch + rename moved files
...
* commit '4038aa8fff8c68733bff8b55d8c8d1b59713ca37':
Enabled incrementals to patch + rename moved files
2013-12-20 11:35:07 -08:00
612a88b7fa
Added a row for the "All platforms" download line (rebuild stl with debug info package)
...
Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f
(cherry picked from commit c25aee2929
2013-12-19 21:48:29 +00:00
1dc56d66fd
am be1c90f5: am 4678625e: am 0707f784: am bf9d72ff: am 07816041: set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
...
* commit 'be1c90f569a3473412344dcc6cfd257398fcbdb5':
set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
2013-12-19 21:22:21 +00:00
0707f784f4
am bf9d72ff: am 07816041: set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
...
* commit 'bf9d72ff4d6952c0546a2bf249938dfbe4f7768e':
set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
2013-12-19 13:15:19 -08:00
bf9d72ff4d
am 07816041: set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
...
* commit '078160410ad4209fb78f59ae8e04a6118914cdb5':
set fixed height for header div to ensure the next/prev links in the training bar are always aligned with TOC
2013-12-19 21:12:19 +00:00
078160410a
set fixed height for header div to ensure the next/prev links
...
in the training bar are always aligned with TOC
Change-Id: I34bb1967e3677bc94298837b0d8f0c6e7bcd8bbf
2013-12-19 12:56:42 -08:00
b0db3411bc
am ade90e43: am da83d321: am b8a5a597: am dab6ac86: am 518dc751: Merge "make the new guide/index.html the link for API Guides." into klp-docs
...
* commit 'ade90e433384cd26758ec0fcb9809dd2a8d50105':
make the new guide/index.html the link for API Guides.
2013-12-17 21:36:01 +00:00
b8a5a597cd
am dab6ac86: am 518dc751: Merge "make the new guide/index.html the link for API Guides." into klp-docs
...
* commit 'dab6ac86013bb9507a59b74abe1b11ab2306f352':
make the new guide/index.html the link for API Guides.
2013-12-17 13:25:17 -08:00
dab6ac8601
am 518dc751: Merge "make the new guide/index.html the link for API Guides." into klp-docs
...
* commit '518dc751a617c1f182cb01cdc8fd06076d1e91ba':
make the new guide/index.html the link for API Guides.
2013-12-17 21:19:44 +00:00
518dc751a6
Merge "make the new guide/index.html the link for API Guides." into klp-docs
2013-12-17 21:17:29 +00:00
4038aa8fff
Enabled incrementals to patch + rename moved files
...
Change-Id: I551fc5291847e3ace15361c203d86f566c26da97
2013-12-16 11:29:51 -08:00
76e1e737fa
am 12fabd87: am b6838aa4: am d6b97d19: am 2c8078fd: Merge "Fix regex for finding symbol data."
...
* commit '12fabd87696f0a3e14e1f50f635a4ed22dba0b3c':
Fix regex for finding symbol data.
2013-12-12 22:07:00 +00:00
d6b97d1943
am 2c8078fd: Merge "Fix regex for finding symbol data."
...
* commit '2c8078fdcc7741d848444a01cd81e5dfb8693f15':
Fix regex for finding symbol data.
2013-12-12 13:57:55 -08:00
2c8078fdcc
Merge "Fix regex for finding symbol data."
2013-12-12 21:53:08 +00:00
65a69446d3
Fix regex for finding symbol data.
...
The new output of debuggerd removed a space between the #00 and the rest
of the line. The regex is very restrictive, so fixing it to handle the new
output.
Change-Id: I5259ae1e56a351608b330dfd858a2021e6d89358
2013-12-12 12:56:16 -08:00
617253bb22
am b6559177: am 1e9e77cc: am 4d744829: am 9b022bdf: am 35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
...
* commit 'b6559177b3105e84dde449f8c5c4db519a047552':
Doc change: Add tag for DevArt.
2013-12-11 23:39:05 +00:00
4d74482911
am 9b022bdf: am 35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
...
* commit '9b022bdf8fba6fd3f2185a303e0bf3b3aa2e3d9e':
Doc change: Add tag for DevArt.
2013-12-11 15:27:50 -08:00
c4b1577d6e
resolved conflicts for merge of 1b53b6a7 to master
...
Change-Id: Id08fb8de4f136596fd39b651446ec96fc952427a
2013-12-11 15:27:46 -08:00
9b022bdf8f
am 35fe9894: Merge "Doc change: Add tag for DevArt." into klp-docs
...
* commit '35fe9894d283153b0a72741e207a586ff70cd558':
Doc change: Add tag for DevArt.
2013-12-11 23:25:13 +00:00
35fe9894d2
Merge "Doc change: Add tag for DevArt." into klp-docs
2013-12-11 23:22:11 +00:00
d532077a8f
am d270230f: Merge "sign_target_files_apks: rewrite build.prop correctly in eng builds"
...
* commit 'd270230fa49311901d8797a9e77865c37857d028':
sign_target_files_apks: rewrite build.prop correctly in eng builds
2013-12-11 15:15:10 -08:00
73d5abbd3f
sign_target_files_apks: rewrite build.prop correctly in eng builds
...
In eng builds, ro.display.id has many space separated items and was
resulting in an error when trying to rewrite it as 'value' gets
turned into a list and never converted back to a string.
Change-Id: I6c8633ed2eb52c56a4097992a32d53d80df4f844
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-12-11 13:23:15 -08:00
d911f7df62
am 13d0294d: am e9c2395f: am f2fbb21d: am ecff92d9: resolved conflicts for merge of 79a55d35 to klp-ub-dev
...
* commit '13d0294d2dfdfcdf93247ff41fa52b9af1475406':
add Analytics event to track sample downloads (for real this time)
2013-12-11 21:09:37 +00:00
47dba06bd0
am f96eebf5: am 3ea44ba7: am ab750f31: am ea64d5de: am 719acb45: update search suggestions to use new unified JS and show samples
...
* commit 'f96eebf52869d2377949cbe858fd48d541a20a27':
update search suggestions to use new unified JS and show samples
2013-12-11 21:09:36 +00:00
932e3fb991
make the new guide/index.html the link for API Guides.
...
Change-Id: I4423e9ab43b349427cc70211dd094760b35e9360
2013-12-11 02:02:32 +00:00
f2fbb21de2
am ecff92d9: resolved conflicts for merge of 79a55d35 to klp-ub-dev
...
* commit 'ecff92d9f7d58b619465259213d7a58ae01c2872':
add Analytics event to track sample downloads (for real this time)
2013-12-10 14:09:15 -08:00
ecff92d9f7
resolved conflicts for merge of 79a55d35 to klp-ub-dev
...
Change-Id: I95f46942e03f125e1a907003520caaf6ab575016
2013-12-10 14:04:30 -08:00
ab750f311c
am ea64d5de: am 719acb45: update search suggestions to use new unified JS and show samples
...
* commit 'ea64d5de02842233b3a163c9c707cc77ce06483c':
update search suggestions to use new unified JS and show samples
2013-12-10 13:52:37 -08:00
ea64d5de02
am 719acb45: update search suggestions to use new unified JS and show samples
...
* commit '719acb4553e1ffcbbe452ba7b3e8c6e5a12515db':
update search suggestions to use new unified JS and show samples
2013-12-10 21:50:34 +00:00
3157a909aa
am 986191e8: am d21407ea: am e8db5f69: am c25aee29: Added a row for the "All platforms" download line (rebuild stl with debug info package)
...
* commit '986191e8327d6b8033686b24579d41f9377934d8':
Added a row for the "All platforms" download line (rebuild stl with debug info package)
2013-12-10 16:42:06 +00:00
e8db5f69d1
am c25aee29: Added a row for the "All platforms" download line (rebuild stl with debug info package)
...
* commit 'c25aee29298f1c1658fb274be15724ce60c0b93e':
Added a row for the "All platforms" download line (rebuild stl with debug info package)
2013-12-10 08:33:13 -08:00
79a55d3585
add Analytics event to track sample downloads (for real this time)
...
Change-Id: I014fd31f0f12698462d44a8afed96ca6e3cfef38
2013-12-09 17:13:56 -08:00
719acb4553
update search suggestions to use new unified JS and show samples
...
Change-Id: Id39091558906db7d43b2d07d09756f71d98502a7
2013-12-09 15:57:26 -08:00
c25aee2929
Added a row for the "All platforms" download line (rebuild stl with debug info package)
...
Change-Id: I333912e697a389b52b5c768e1218b7d146775c9f
2013-12-09 13:24:13 -08:00
1ad7adeaa7
some builds don't have a build.prop?
...
Change-Id: I31ab106a1934ff4bb7076c184f4d7581336e16da
2013-12-06 11:53:27 -08:00
df12406ad8
Merge "fix timestamps in images to the build date"
2013-12-06 19:27:58 +00:00
6e8f53c276
Fix unsparse image reuse bug.
...
This would cause an existing sparse image to be reused by a
subsequent build, leading to verity failures.
Change-Id: I2082df3dfba014515c9267e02189fe9987a56830
2013-12-05 17:09:18 -08:00
850b80780d
fix timestamps in images to the build date
...
Pass the -T option to mkuserimg.sh to set all timestamps in the system
image (and any other ext4 image we build) to the value of
ro.build.date.utc for the build. This makes images produced from a
given target_files bit-identical.
Change-Id: Ibba5fa7a610f476209ef61708729cfd79dece0b6
2013-12-05 15:54:55 -08:00
8f6949b611
Doc change: Add tag for DevArt.
...
Change-Id: Id6ecac1587e311373b2f787fb86b85c2c9933183
2013-12-03 19:07:13 -08:00
b00398a07e
am a6fadb61: am 57c9ffef: am 9b23f2cd: add option to generate two-step recovery files
...
* commit 'a6fadb61cae38089bc534f3cb995b98689f796cb':
add option to generate two-step recovery files
2013-12-03 17:06:04 +00:00
a6fadb61ca
am 57c9ffef: am 9b23f2cd: add option to generate two-step recovery files
...
* commit '57c9ffef30a6f34e126d8e89a08d208b05cc4901':
add option to generate two-step recovery files
2013-12-03 08:58:11 -08:00
57c9ffef30
am 9b23f2cd: add option to generate two-step recovery files
...
* commit '9b23f2cd786b46991b7c0198e69264b17875288d':
add option to generate two-step recovery files
2013-12-03 08:56:05 -08:00
387aa8b5b1
am fc79229c: am d239e4c9: Support generated samples_toc.cs file.
...
* commit 'fc79229c7c09058be1064c61c2287cdc7cd366da':
Support generated samples_toc.cs file.
2013-12-03 01:19:20 +00:00
fc79229c7c
am d239e4c9: Support generated samples_toc.cs file.
...
* commit 'd239e4c9b5c154129d67bec9cd7b37b2720bf2b6':
Support generated samples_toc.cs file.
2013-12-02 17:12:41 -08:00
d239e4c9b5
Support generated samples_toc.cs file.
...
Change-Id: I34eeffbc98f729e13de805e7bbb9dac96d13fdd8
2013-12-03 00:16:14 +00:00
9b23f2cd78
add option to generate two-step recovery files
...
When run with the -2 option, ota_from_target_files will generate a
package (full or incremental) that does some extra reboots in order to
install the new recovery first, so that the rest of the installation
is done with the new recovery. This can be useful if (say) the
package installation needs some features from the newer kernel.
For incremental packages, the verification phase is still done with
the old recovery.
This is only supported on devices where the misc partition is EMMC
(not MTD).
Two-step packages are slower to install and possibly confusing to
users (they will see their device reboot four times instead of twice),
so only use this option if necessary.
Change-Id: I3267d905e5e8eb1a1eb61bf48255b8b24ffc4ad1
2013-11-27 11:27:55 -08:00
cb067ad2f6
am c3644114: am 8ea83e90: am 96f56b6f: Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
...
* commit 'c3644114805150eef2f5035085878e5f860c7436':
Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
2013-11-21 22:59:47 -08:00
c364411480
am 8ea83e90: am 96f56b6f: Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
...
* commit '8ea83e902d931591af37e747763e768e7a6990be':
Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
2013-11-21 17:16:26 -08:00
8ea83e902d
am 96f56b6f: Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
...
* commit '96f56b6fcbe21c2786ec985bee252e5cd5c3190b':
Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
2013-11-21 17:11:44 -08:00
96f56b6fcb
Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
2013-11-22 01:08:53 +00:00
90c60d3b92
Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
...
This reverts commit 37335b4238
2013-11-22 00:52:51 +00:00
8d6e31d944
am c1b340e1: am 927612f4: am 42d6e581: fix the \'to top\' link; it wasn\'t appearing due to a previous CSS change
...
* commit 'c1b340e1a6aad0f82cff7251379b0583833849d0':
fix the 'to top' link; it wasn't appearing due to a previous CSS change
2013-11-20 19:46:02 -08:00
c1b340e1a6
am 927612f4: am 42d6e581: fix the \'to top\' link; it wasn\'t appearing due to a previous CSS change
...
* commit '927612f4df56caf0ac639efcd1c89801d2c13972':
fix the 'to top' link; it wasn't appearing due to a previous CSS change
2013-11-20 19:42:37 -08:00
927612f4df
am 42d6e581: fix the \'to top\' link; it wasn\'t appearing due to a previous CSS change
...
* commit '42d6e58195445617fb739d5363d5f23a7b5d990c':
fix the 'to top' link; it wasn't appearing due to a previous CSS change
2013-11-21 03:38:48 +00:00
42d6e58195
fix the 'to top' link; it wasn't appearing due to a previous CSS change
...
Change-Id: I00aa080982f5e5d90fd6abcf6e19d41d1727b444
2013-11-20 19:31:26 -08:00
6913165edf
am c694cf89: am afc4db3b: make short banners even shorter also add new "next-docs" style for links at the end of a doc.
...
* commit 'c694cf89295ba76dcc2d68a19a143d27a60bf93a':
make short banners even shorter also add new "next-docs" style for links at the end of a doc.
2013-11-20 18:12:57 -08:00
c694cf8929
am afc4db3b: make short banners even shorter also add new "next-docs" style for links at the end of a doc.
...
* commit 'afc4db3b341b82b5f31c624abce292d4f71b76b3':
make short banners even shorter also add new "next-docs" style for links at the end of a doc.
2013-11-21 02:09:25 +00:00
afc4db3b34
make short banners even shorter
...
also add new "next-docs" style for links at the end of a doc.
Change-Id: I696a01f7614614eec56d9774036559af6bfe0378
(cherry picked from commit 9d6461dfab
2013-11-21 02:06:29 +00:00
6948b3f40d
Merge "make short banners even shorter also add new "next-docs" style for links at the end of a doc."
2013-11-21 02:06:15 +00:00
9d6461dfab
make short banners even shorter
...
also add new "next-docs" style for links at the end of a doc.
Change-Id: I696a01f7614614eec56d9774036559af6bfe0378
2013-11-20 17:57:15 -08:00
697c2fb391
am 0ee84713: am 3956c322: am 2fbc1c95: add analytics event to track sample downloads
...
* commit '0ee847132b7782839b7c082ea46445315b9ce727':
add analytics event to track sample downloads
2013-11-20 16:35:46 -08:00
0ee847132b
am 3956c322: am 2fbc1c95: add analytics event to track sample downloads
...
* commit '3956c3221386cea7ccb760b1ff1a51e26a0ae79b':
add analytics event to track sample downloads
2013-11-20 16:32:48 -08:00
3956c32213
am 2fbc1c95: add analytics event to track sample downloads
...
* commit '2fbc1c95377e8a4cfd33b08ef2f615ccd78cdc6a':
add analytics event to track sample downloads
2013-11-21 00:29:39 +00:00
2fbc1c9537
add analytics event to track sample downloads
...
Change-Id: Ibb6ca88845ca0f26b759503fbca540009e1d7c8c
2013-11-20 15:22:15 -08:00
e189a141c9
am 8b5d96bb: am 01f988f7: am 95cd097f: Merge "add analytics event tracking for SDK tools download" into klp-docs
...
* commit '8b5d96bb772d1e859d4f7460da9937280aa8d3ca':
add analytics event tracking for SDK tools download
2013-11-20 13:03:26 -08:00
8b5d96bb77
am 01f988f7: am 95cd097f: Merge "add analytics event tracking for SDK tools download" into klp-docs
...
* commit '01f988f7be6c875197aa39e8a223c26f1fe564c7':
add analytics event tracking for SDK tools download
2013-11-20 13:00:57 -08:00
01f988f7be
am 95cd097f: Merge "add analytics event tracking for SDK tools download" into klp-docs
...
* commit '95cd097f429483dbea76804515c2d5b4de5037f7':
add analytics event tracking for SDK tools download
2013-11-20 20:59:17 +00:00
95cd097f42
Merge "add analytics event tracking for SDK tools download" into klp-docs
2013-11-20 20:57:05 +00:00
c9418f4456
add analytics event tracking for SDK tools download
...
Change-Id: I6ad2d540a3d496a8f563c22a0778c0f4bbd67f6c
2013-11-20 12:52:22 -08:00
5ca1c0d9fc
am 25eec8bf: am d8bb1b11: am acecb040: Add jd_lists_unified.cs to sac, pdk, ds templates.
...
* commit '25eec8bf3ec712c6628992e217b9eea4cb8ac5f7':
Add jd_lists_unified.cs to sac, pdk, ds templates.
2013-11-20 11:31:02 -08:00
25eec8bf3e
am d8bb1b11: am acecb040: Add jd_lists_unified.cs to sac, pdk, ds templates.
...
* commit 'd8bb1b11068aa423884cff1862ffb0f0362da16f':
Add jd_lists_unified.cs to sac, pdk, ds templates.
2013-11-20 11:27:11 -08:00
d8bb1b1106
am acecb040: Add jd_lists_unified.cs to sac, pdk, ds templates.
...
* commit 'acecb040464c4d8cf21c25369360b6d4d06034e0':
Add jd_lists_unified.cs to sac, pdk, ds templates.
2013-11-20 19:23:23 +00:00
acecb04046
Add jd_lists_unified.cs to sac, pdk, ds templates.
...
Change-Id: I4d3216018932e0482e20f01c944429e0a7ccee65
2013-11-20 11:18:19 -08:00
62440ec22f
am 7aa10021: am 8b8a23c6: am bb2b5538: Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages.
...
* commit '7aa10021e7f211211e8edd0299114756f0586567':
Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages.
2013-11-19 19:25:07 -08:00
7aa10021e7
am 8b8a23c6: am bb2b5538: Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages.
...
* commit '8b8a23c6f4a0c7b7a0bdc9a87398e1aac4e92f5a':
Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages.
2013-11-19 19:22:48 -08:00
8b8a23c6f4
am bb2b5538: Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages.
...
* commit 'bb2b55381d0fde9acf5d367b0d5409d4317cfc17':
Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages.
2013-11-20 02:39:59 +00:00
bb2b55381d
Show overview, project, and download links on samples project index pages. Show standard plusone on all samples pages.
...
Change-Id: I368fe1e0004e623cfbdaa39ff74e82f31c9f95d8
2013-11-19 18:26:51 -08:00
f132f9c177
am ee1934be: am ea994c2a: am 45734df7: Merge "Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var." into klp-docs
...
* commit 'ee1934be485e6f25fd9b89c8bf415d13326de1ab':
Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var.
2013-11-18 17:59:48 -08:00
ee1934be48
am ea994c2a: am 45734df7: Merge "Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var." into klp-docs
...
* commit 'ea994c2ad282cf744414a208f9ec2a8be67ca1aa':
Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var.
2013-11-18 17:58:08 -08:00
ea994c2ad2
am 45734df7: Merge "Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var." into klp-docs
...
* commit '45734df779f3653c3b9f1ecdc0aa21ddc4c76cf0':
Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var.
2013-11-19 01:54:49 +00:00
45734df779
Merge "Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var." into klp-docs
2013-11-19 01:51:12 +00:00
1f50400241
Fix a misnamed variable to fix the build.
...
Change-Id: Ia69d48ace0a6c10c5e6ea06714e52b8c937e213f
2013-11-17 18:10:55 -08:00
fd6f7513f8
Add support for verity builds to the build system.
...
Change-Id: I3ef908d8d52ec88de453b161bbc3f198517a72f1
2013-11-17 16:09:34 -08:00
9b3059f405
Add new jd_lists_unified template for unified metadata. Expose page tags to JavaScript through metaTags var.
...
Change-Id: I6cc7d980e627d3be06f9dee6af4d9e9ebd272577
2013-11-14 13:33:17 -08:00
759c657213
Merge "Docs: replacing analytics ID from D.A.C. Bug: 11476435"
2013-11-14 17:38:00 +00:00
3af8c20a0a
am 82335c87: am 9526eefb: am 4e5b39d8: style adjustment to design/dev/video buttons
...
* commit '82335c87c1a6295c6de44f0b203b66e4020f51d6':
style adjustment to design/dev/video buttons
2013-11-13 22:17:58 -08:00
82335c87c1
am 9526eefb: am 4e5b39d8: style adjustment to design/dev/video buttons
...
* commit '9526eefbf30da333c003d7278d2977e70304a180':
style adjustment to design/dev/video buttons
2013-11-13 18:12:20 -08:00
9526eefbf3
am 4e5b39d8: style adjustment to design/dev/video buttons
...
* commit '4e5b39d843548acaac73d1d1f729324805eda0a8':
style adjustment to design/dev/video buttons
2013-11-14 02:08:29 +00:00
4c01694fe0
Docs: replacing analytics ID from D.A.C.
...
Bug: 11476435
Change-Id: I834646e6a618709fe21afa5958bd28f822991e29
2013-11-13 17:46:29 -08:00
4e5b39d843
style adjustment to design/dev/video buttons
...
Change-Id: I97a147336805aeb340efcd12009794b02afab681
2013-11-13 16:49:22 -08:00
40d2cfc01e
am 38f1aed0: am dcc645eb: am dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-dev
...
* commit '38f1aed01d7bfeba6368d321f1233fa2b7903cb5':
Revert the revert. (its time to sign MR1)
2013-11-12 19:28:54 -08:00
38f1aed01d
am dcc645eb: am dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-dev
...
* commit 'dcc645ebb1a87982d2a067b8584ff167ae2c5287':
Revert the revert. (its time to sign MR1)
2013-11-12 16:46:48 -08:00
dcc645ebb1
am dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-dev
...
* commit 'dd00a9677b21d2dbdef6b085570e1358f172de80':
Revert the revert. (its time to sign MR1)
2013-11-12 16:42:25 -08:00
dd00a9677b
Merge "Revert the revert. (its time to sign MR1)" into klp-dev
2013-11-13 00:38:47 +00:00
beb6afdee2
Revert the revert. (its time to sign MR1)
...
Revert "Waiting till post MR0 - this impacts signing tools for MR0."
This reverts commit a7b5c4a7dc
2013-11-13 00:23:10 +00:00
43ee8eb189
am ab5808b0: am 680821ed: am 13cd8f15: add style for video button in docs
...
* commit 'ab5808b007f97bf7b8f6d0374c546bddeabb4e16':
add style for video button in docs
2013-11-12 12:25:57 -08:00
9d288052d0
am ec5b24f4: am faff9f52: am 641c2c2f: clarify the hidden APIs in reference with better tooltips
...
* commit 'ec5b24f4737ed2c566a8f63b3d27f049a2188a3f':
clarify the hidden APIs in reference with better tooltips
2013-11-12 12:25:56 -08:00
ab5808b007
am 680821ed: am 13cd8f15: add style for video button in docs
...
* commit '680821ed27a2a2dfce7298434307065aa5ed56aa':
add style for video button in docs
2013-11-12 12:22:03 -08:00
ec5b24f473
am faff9f52: am 641c2c2f: clarify the hidden APIs in reference with better tooltips
...
* commit 'faff9f52c1882d4a2eadce90bf90b0fbd7082632':
clarify the hidden APIs in reference with better tooltips
2013-11-12 12:22:02 -08:00
680821ed27
am 13cd8f15: add style for video button in docs
...
* commit '13cd8f15476ec66145b3685ca5ce181491fe28c0':
add style for video button in docs
2013-11-12 20:18:38 +00:00
faff9f52c1
am 641c2c2f: clarify the hidden APIs in reference with better tooltips
...
* commit '641c2c2fdaf68fa48b044177fef7c890a42c8a11':
clarify the hidden APIs in reference with better tooltips
2013-11-12 20:18:38 +00:00
13cd8f1547
add style for video button in docs
...
Change-Id: I2f2dcf80aef9c55ad6a11f13549b8dd8709cbc84
2013-11-12 11:55:24 -08:00
c5d3cb362c
am 3b44339d: am 37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
...
* commit '3b44339d6a443fde57db4ae84a7e46823da6d162':
Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
2013-11-07 16:13:15 -08:00
3b44339d6a
am 37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
...
* commit '37335b42385970d957d48056145a3d4c4dbc6087':
Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
2013-11-07 15:00:42 -08:00
Dirk Dougherty