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
37335b4238
Enable incremental builder to find files that moved, and
...
try to process them via patch + rename, instead of
delete + add.
b/11437930
Change-Id: Ie70632a2fa0a13d4bb259f61c620bb01812494e5
2013-11-07 11:36:03 -08:00
641c2c2fda
clarify the hidden APIs in reference with better tooltips
...
Change-Id: Iaa843b4a0462195084fb7a35e826eeec92d50c64
2013-10-31 14:48:45 -07:00
03aca9a712
script to handle new static landing pages for sample topics
...
Change-Id: If90531da327e2d664ca7856af6a9737ea1879eaa
(cherry picked from commit 241dbd1565
2013-10-31 16:40:35 +00:00
198bd8fd38
am d2479d2b: am 241dbd15: script to handle new static landing pages for sample topics
...
* commit 'd2479d2beb6e19072c72e67046caff5d2448e4fb':
script to handle new static landing pages for sample topics
2013-10-31 07:35:50 -07:00
d2479d2beb
am 241dbd15: script to handle new static landing pages for sample topics
...
* commit '241dbd1565b3693bfc2cc9ee3e9e50bcd2f8a7f0':
script to handle new static landing pages for sample topics
2013-10-31 07:33:07 -07:00
241dbd1565
script to handle new static landing pages for sample topics
...
Change-Id: If90531da327e2d664ca7856af6a9737ea1879eaa
2013-10-31 07:27:10 -07:00
e09379cae5
am 70120d0b: am 36ea7a3d: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
...
* commit '70120d0bffcce16c3c94120fde3cd2c495e5027d':
remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
2013-10-30 16:45:01 -07:00
70120d0bff
am 36ea7a3d: remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
...
* commit '36ea7a3d74c68d62a5d081401b887e848370f6d8':
remove the dummy sidenav from samples before populating the real list. Also make the line numbers hidden before they get moved to avoid some jankyness during load.
2013-10-30 16:41:42 -07:00
f1435b73bd
remove the dummy sidenav from samples before populating the real list.
...
Also make the line numbers hidden before they get moved to avoid
some jankyness during load.
Change-Id: I11c3df6d6c7a9a2e74be938b0f0ec704e71eb8d4
(cherry picked from commit 36ea7a3d74
2013-10-30 23:33:57 +00:00
36ea7a3d74
remove the dummy sidenav from samples before populating the real list.
...
Also make the line numbers hidden before they get moved to avoid
some jankyness during load.
Change-Id: I11c3df6d6c7a9a2e74be938b0f0ec704e71eb8d4
2013-10-30 16:29:22 -07:00
05480369c5
am a0df6345: am e9fbac49: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
...
* commit 'a0df634521840d6d9b154129bb57afe97667f13d':
make expandable lists under each sample sticky so they don't collapse when opening other project directories.
2013-10-30 15:27:28 -07:00
a0df634521
am e9fbac49: make expandable lists under each sample sticky so they don\'t collapse when opening other project directories.
...
* commit 'e9fbac49bba45008d8741f3f93b47e866093e238':
make expandable lists under each sample sticky so they don't collapse when opening other project directories.
2013-10-30 15:25:03 -07:00
70557ee5fc
make expandable lists under each sample sticky so they don't collapse
...
when opening other project directories.
change code comment color from red to green, and strings from green to red.
Make sidenav file names smaller.
Change-Id: Idd074c7beba48f79c8c551d319c36fb5ecbbcb5f
2013-10-30 22:20:53 +00:00
e9fbac49bb
make expandable lists under each sample sticky so they don't collapse
...
when opening other project directories.
change code comment color from red to green, and strings from green to red.
Make sidenav file names smaller.
Change-Id: Idd074c7beba48f79c8c551d319c36fb5ecbbcb5f
2013-10-30 15:19:41 -07:00
2fa4c49d7c
am 5404ae42: am 3c0c1274: Merge "Add n5 landscape-13 device video frame and css." into klp-dev
...
* commit '5404ae42e7d982e9bf74fe1bd6e7d4109224e530':
Add n5 landscape-13 device video frame and css.
2013-10-29 18:32:40 -07:00
5404ae42e7
am 3c0c1274: Merge "Add n5 landscape-13 device video frame and css." into klp-dev
...
* commit '3c0c127468bb29ceabb4651273efc386aca1ac85':
Add n5 landscape-13 device video frame and css.
2013-10-29 18:30:35 -07:00
3c0c127468
Merge "Add n5 landscape-13 device video frame and css." into klp-dev
2013-10-30 01:27:10 +00:00
932f5a3720
am 3b676732: am 57ab9435: Merge "Adjust samples output pages." into klp-dev
...
* commit '3b676732913c1fcfbf6b948fe4e1a69e42f5faeb':
Adjust samples output pages.
2013-10-29 16:42:53 -07:00
3b67673291
am 57ab9435: Merge "Adjust samples output pages." into klp-dev
...
* commit '57ab94354c02b06f548293e22bd7186da11f07a2':
Adjust samples output pages.
2013-10-29 16:40:56 -07:00
57ab94354c
Merge "Adjust samples output pages." into klp-dev
2013-10-29 23:35:12 +00:00
ca1858aca9
Add n5 landscape-13 device video frame and css.
...
Change-Id: I3b18782680e74bd8d4022e6701bfd61887101cf1
2013-10-29 16:25:00 -07:00
4bddbb1c77
Adjust samples output pages.
...
Change-Id: I78a523f218f8733d4a3428e1d54c3c5c471cfa17
2013-10-29 15:42:10 -07:00
5d12ab6b35
am ba5b20eb: am 1a00f7fe: fix \'next\' links to disable them when at the end of a list. Also remove the "next class" link at the end of training.
...
* commit 'ba5b20eb9f1714193780518aa1ac2ac8087fb3b7':
fix 'next' links to disable them when at the end of a list. Also remove the "next class" link at the end of training.
2013-10-29 11:23:47 -07:00
ba5b20eb9f
am 1a00f7fe: fix \'next\' links to disable them when at the end of a list. Also remove the "next class" link at the end of training.
...
* commit '1a00f7fecd240871caa219bb45460b43c652c604':
fix 'next' links to disable them when at the end of a list. Also remove the "next class" link at the end of training.
2013-10-29 11:22:07 -07:00
1a00f7fecd
fix 'next' links to disable them when at the end of a list.
...
Also remove the "next class" link at the end of training.
Change-Id: I1d81919a0498d57b451741a7a0c12f011921f2cb
2013-10-29 11:13:26 -07:00
79cfe50c63
am e45fbe5e: am db932024: Merge "Doc change: css for n5 device video frame." into klp-dev
...
* commit 'e45fbe5ea73784d2290ff26f6bbd9275743b1135':
Doc change: css for n5 device video frame.
2013-10-26 17:12:26 -07:00
e45fbe5ea7
am db932024: Merge "Doc change: css for n5 device video frame." into klp-dev
...
* commit 'db932024363c1a8d867dd7b5eb6eca0c185d325e':
Doc change: css for n5 device video frame.
2013-10-26 17:09:24 -07:00
db93202436
Merge "Doc change: css for n5 device video frame." into klp-dev
2013-10-27 00:04:01 +00:00
d5d3f805e0
Doc change: css for n5 device video frame.
...
Change-Id: I283c5c7cb3bb84c494b493b333e47f69b2595501
2013-10-26 12:17:44 -07:00
aa4a34ec1f
am 31469e36: am a7b5c4a7: Waiting till post MR0 - this impacts signing tools for MR0.
...
* commit '31469e36e078e044e883aeb103888af3411e9691':
Waiting till post MR0 - this impacts signing tools for MR0.
2013-10-23 18:32:47 -07:00
31469e36e0
am a7b5c4a7: Waiting till post MR0 - this impacts signing tools for MR0.
...
* commit 'a7b5c4a7dc77a0896d6314828b9ce85f82d103e8':
Waiting till post MR0 - this impacts signing tools for MR0.
2013-10-23 18:30:01 -07:00
a7b5c4a7dc
Waiting till post MR0 - this impacts signing tools for MR0.
...
Revert "Modify release tools to replace certs in MMAC files."
This reverts commit a6e0466ab5
2013-10-23 16:53:43 +00:00
a6e0466ab5
Modify release tools to replace certs in MMAC files.
...
Added support to perform a string replace of specified
dev keys with release keys when using the release tool
scripts.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
(cherry picked from commit 817c574d75
2013-10-22 13:54:46 -07:00
44bf9875a1
Merge "Output annotations in sdk package-summary docs."
2013-10-17 17:01:04 +00:00
3f24dda64b
am 011a38d1: am 2b205a58: am 919edbe7: am 1c094509: am 6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
...
* commit '011a38d184c21d3c6195503244a2d4d31befbb28':
fix javadoc sidenav so it does not cutoff overflowing link names
2013-10-16 17:26:19 -07:00
011a38d184
am 2b205a58: am 919edbe7: am 1c094509: am 6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
...
* commit '2b205a5814c39d7b6e7c6646e3ec9da4dad6dcb8':
fix javadoc sidenav so it does not cutoff overflowing link names
2013-10-16 17:23:45 -07:00
2b205a5814
am 919edbe7: am 1c094509: am 6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
...
* commit '919edbe7761767c1ed3e3bb3715aa495908601c7':
fix javadoc sidenav so it does not cutoff overflowing link names
2013-10-16 17:17:37 -07:00
6c030b7361
fix javadoc sidenav so it does not cutoff overflowing link names
...
Change-Id: I48f3a7cf4715061702c0a0c7537fa1b09734c62a
2013-10-16 17:04:37 -07:00
7678688f37
Output annotations in sdk package-summary docs.
...
Bug 10749552
Bug 6333357
Change-Id: I57e97ee69d41bb8df5ea371a766ebb7e0602ff90
2013-10-15 20:41:49 -07:00
c1db022f96
am c14c27af: am a3362a7f: am d19a1ff4: am 3f4fcef5: am 25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
...
* commit 'c14c27af745e8c5941e2b8359995c764689020a5':
enable auto-linking to next lesson with 'next-page-link' css class
2013-10-15 04:03:35 -07:00
c14c27af74
am a3362a7f: am d19a1ff4: am 3f4fcef5: am 25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
...
* commit 'a3362a7f67b87e89f5d82cf62f51d6b36be008fc':
enable auto-linking to next lesson with 'next-page-link' css class
2013-10-14 19:00:51 -07:00
7e26327b11
am 16d2dccd: am b0af7e51: am cc68ce70: Merge "Allow ECDSA signing OTA files"
...
* commit '16d2dccd09fdc82b1729986e85babf498749f02b':
Allow ECDSA signing OTA files
2013-10-14 14:16:18 -07:00
16d2dccd09
am b0af7e51: am cc68ce70: Merge "Allow ECDSA signing OTA files"
...
* commit 'b0af7e5107abb17fc756044454b3a452d0dafb50':
Allow ECDSA signing OTA files
2013-10-14 14:13:44 -07:00
b0af7e5107
am cc68ce70: Merge "Allow ECDSA signing OTA files"
...
* commit 'cc68ce7012784a3d2ad12e041c8e82def74f20cd':
Allow ECDSA signing OTA files
2013-10-14 14:10:05 -07:00
a3362a7f67
am d19a1ff4: am 3f4fcef5: am 25c89dda: enable auto-linking to next lesson with \'next-page-link\' css class
...
* commit 'd19a1ff4b2c4a3c7d76ea94702776e8b2087d705':
enable auto-linking to next lesson with 'next-page-link' css class
2013-10-14 13:17:46 -07:00
25c89dda9f
enable auto-linking to next lesson with 'next-page-link' css class
...
Change-Id: I9f4068a4b0921eee28eee3258b72e5f3ad48a64d
2013-10-14 13:07:55 -07:00
01ed66d2ba
Allow ECDSA signing OTA files
...
ECDSA works in the recovery verifier, so we can allow OTA updates to be
signed with EC keys.
Change-Id: If8f2be028843fbfd6c8c9c41b492605d9b5cbeb0
2013-10-09 15:00:24 -07:00
9b2810568e
am 2b983b22: am c80b7cda: am 2acb1ea7: Merge "SignApk: add argument for loading a Provider"
...
* commit '2b983b2299f0f3042916c0d0f3eaa310cc532ed4':
SignApk: add argument for loading a Provider
2013-09-25 14:45:12 -07:00
2b983b2299
am c80b7cda: am 2acb1ea7: Merge "SignApk: add argument for loading a Provider"
...
* commit 'c80b7cdaebfaeae1b95ad49b5a2782f9e5ee8727':
SignApk: add argument for loading a Provider
2013-09-25 14:41:54 -07:00
c80b7cdaeb
am 2acb1ea7: Merge "SignApk: add argument for loading a Provider"
...
* commit '2acb1ea76d294f993993a0852c30dd93dc46c600':
SignApk: add argument for loading a Provider
2013-09-25 14:39:48 -07:00
9432e7fc65
am 9f99cffb: am c4b84239: am 085d3b5f: Merge "Read algorithm OID directly from PKCS#8 container"
...
* commit '9f99cffb4eb40922086ef10daf6bd86de4d476d8':
Read algorithm OID directly from PKCS#8 container
2013-09-25 11:52:12 -07:00
9f99cffb4e
am c4b84239: am 085d3b5f: Merge "Read algorithm OID directly from PKCS#8 container"
...
* commit 'c4b84239063082418f474707ac1dcc2270c8c698':
Read algorithm OID directly from PKCS#8 container
2013-09-25 11:49:07 -07:00
c4b8423906
am 085d3b5f: Merge "Read algorithm OID directly from PKCS#8 container"
...
* commit '085d3b5fdbb1d02607ee107581c22c090082db65':
Read algorithm OID directly from PKCS#8 container
2013-09-25 11:45:30 -07:00
89c961aa11
SignApk: add argument for loading a Provider
...
For supporting loading a custom key type provider, add a -providerClass
argument that loads the selected JCE at the front of the provider list.
Change-Id: I3df16f7c570d36e08806b614d6f30c41cb117565
2013-09-25 11:37:52 -07:00
62ea4a5c3c
Read algorithm OID directly from PKCS#8 container
...
The PKCS#8 PrivateKeyInfo structure has the algorithm OID encoded right
before the actual key octet stream is encoded. Use Bouncycastle to read
the OID for creation with the key factory.
This aids in the creation of custom key types that are backed by
hardware devices (e.g., HSMs) and have their own assigned OIDs.
Change-Id: If5d8fe07bc157e9bb5a3fb5f99091e924143105f
2013-09-25 09:59:10 -07:00
cc225ebbbe
am 842117da: am 19ccb3a6: am abc0bf08: Merge "SignApk: add support for EC keys"
...
* commit '842117daf383f2ce89e487d8806eb27cc4eb1f52':
SignApk: add support for EC keys
2013-09-24 11:14:00 -07:00
842117daf3
am 19ccb3a6: am abc0bf08: Merge "SignApk: add support for EC keys"
...
* commit '19ccb3a62a6024de0cfd984a97a85a51a45f028b':
SignApk: add support for EC keys
2013-09-24 11:10:47 -07:00
19ccb3a62a
am abc0bf08: Merge "SignApk: add support for EC keys"
...
* commit 'abc0bf084beea3251c042b28576c8f398749c80b':
SignApk: add support for EC keys
2013-09-24 11:07:58 -07:00
3d2365c068
SignApk: add support for EC keys
...
Change-Id: I09bc0e52fc84ec321b997016a8f97de1bfd2770d
2013-09-20 15:00:49 -07:00
84f12ed9d8
am 13722ac8: Merge "SignApk: update SignApk to support SHA256withRSA signing"
...
* commit '13722ac89f5512b932f13895217a6f861b77f57e':
SignApk: update SignApk to support SHA256withRSA signing
2013-09-20 14:20:24 -07:00
8562fd478d
SignApk: update SignApk to support SHA256withRSA signing
...
(cherry picked from commit c0581a02ed
2013-09-20 13:14:32 -07:00
653ab6d5ba
am 118cb04f: am 00a218a9: am 14e066d5: am 4ec62cee: am 40de3237: add support for custom <head> tags in each file with page.customHeadTag HDF var
...
* commit '118cb04f92fa0e37d6c904b5b7b484f728722712':
add support for custom <head> tags in each file with page.customHeadTag HDF var
2013-09-20 11:22:20 -07:00
118cb04f92
am 00a218a9: am 14e066d5: am 4ec62cee: am 40de3237: add support for custom <head> tags in each file with page.customHeadTag HDF var
...
* commit '00a218a9c818fd69b8f43b950109183d13f01296':
add support for custom <head> tags in each file with page.customHeadTag HDF var
2013-09-20 10:09:33 -07:00
00a218a9c8
am 14e066d5: am 4ec62cee: am 40de3237: add support for custom <head> tags in each file with page.customHeadTag HDF var
...
* commit '14e066d5c8aedfad8b29b6784793f416af01e392':
add support for custom <head> tags in each file with page.customHeadTag HDF var
2013-09-20 10:07:04 -07:00
40de323797
add support for custom <head> tags in each file with page.customHeadTag HDF var
...
Change-Id: I377910acec78c600d20cf10ca6aa706750107093
2013-09-20 09:09:40 -07:00
dd676c4139
am 5a6e47bf: am b7530442: am a18b429f: am fe340fac: am e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
...
* commit '5a6e47bffb8d0bfec2f9adcfd11cac5545db596a':
update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 18:06:54 -07:00
5a6e47bffb
am b7530442: am a18b429f: am fe340fac: am e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
...
* commit 'b7530442594903a0a0a9bb0b9cb41edc8c0de72b':
update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 18:03:33 -07:00
b753044259
am a18b429f: am fe340fac: am e624b3fa: update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
...
* commit 'a18b429fd3792b7c3fad2e0682aa39990b332c98':
update the init_google_navtree2 method to handle new format for sample nav tree data. and update highlighting logic to handle hashtags
2013-09-13 18:00:16 -07:00
717ee5ab0e
am 13871a8f: resolved conflicts for merge of 65d5e788 to klp-dev-plus-aosp
...
* commit '13871a8f500b0f9a5e167be3487c1e8d1f92f327':
Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
2013-09-13 17:56:51 -07:00
13871a8f50
resolved conflicts for merge of 65d5e788 to klp-dev-plus-aosp
...
Change-Id: Iad8793c5e53b239425e9bba1b6a925265ff8d130
2013-09-13 17:50:29 -07:00
65d5e78865
am 4b7d8f11: Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS"
...
* commit '4b7d8f119a15a21445d6bc872b8e36e6f848e846':
Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
2013-09-13 17:43:34 -07:00
e624b3fa47
update the init_google_navtree2 method to handle new format for sample nav tree data.
...
and update highlighting logic to handle hashtags
Change-Id: I77de8faaaeed12317aa83086df8273648a1ff00a
2013-09-13 17:04:39 -07:00
322659830f
am cd2ced23: am d9fa5580: am 0c2b69d5: am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
...
* commit 'cd2ced2375e5d0b504c6cdbe95e1f0602b6108af':
fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:22:42 -07:00
cd2ced2375
am d9fa5580: am 0c2b69d5: am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
...
* commit 'd9fa558056871433425746499d2bbf4e4d0fc92e':
fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:19:47 -07:00
d9fa558056
am 0c2b69d5: am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag
...
* commit '0c2b69d5b82062ecdef39297ddc7f7d86d038ad8':
fix most of size problems of DAC on handsets. set device-width for viewport tag
2013-09-11 10:17:38 -07:00
69fecd43c1
am 46f00b61: am b5d4c0df: Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
...
* commit '46f00b6167f4c23dd4874abe9377bac85e965b2f':
Update OTA to understand SELinux labels and capabilities
2013-09-10 13:17:18 -07:00
46f00b6167
am b5d4c0df: Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
...
* commit 'b5d4c0df503966f2a050af64dfa15c84f2e12c15':
Update OTA to understand SELinux labels and capabilities
2013-09-10 13:14:54 -07:00
0eb17d9447
Update OTA to understand SELinux labels and capabilities
...
Update the OTA generation script to understand SELinux file
labels and file capabilities.
Make fs_config aware of SELinux labels and file capabilities, and
optionally output those elements whenever we output the
UID / GID / file perms. The information is emitted as a key=value pair
to allow for future extensibility.
Pass the SELinux file label and capabilities to the newly created
set_metadata() and set_metadata_recursive() calls. When the OTA
script fixes up filesystem permissions, it will also fix up the SELinux
labels and file capabilities.
If no SELinux label and capabilities are available for the file, use
the old set_perm and set_perm_recursive calls.
Bug: 8985290
Bug: 10183961
Bug: 10186213
Change-Id: I4fcfb2c234dbfb965cee9e62f060092a4274d22d
2013-09-10 12:30:43 -07:00
2552239a52
fix most of size problems of DAC on handsets.
...
set device-width for viewport tag
Change-Id: I87854bfac990d277ba95cc7bcf37799c7f36a0ee
2013-09-09 18:51:49 -07:00
7216ef048b
am 2c6124fd: am 00fcdfed: am 0b345f58: am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
...
* commit '2c6124fd6fce0b2f8499b577de02a8c187563f51':
Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 13:46:31 -07:00
2c6124fd6f
am 00fcdfed: am 0b345f58: am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
...
* commit '00fcdfede678c274675436d0008fc4a668ef711c':
Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 13:38:27 -07:00
00fcdfede6
am 0b345f58: am 471f0cc8: am 243ffc5b: Merge "Build file breadcrumb from parentdirs keys, optionally linkify." into jb-mr2-docs
...
* commit '0b345f589691a774d04a698e80412c531c726f6c':
Build file breadcrumb from parentdirs keys, optionally linkify.
2013-09-06 11:51:52 -07:00
Scott Main